summaryrefslogtreecommitdiffstats
path: root/src/Authoring
Commit message (Collapse)AuthorAgeFilesLines
* Fix editor crash at shutdownMiikka Heikkinen2018-06-185-5/+17
| | | | | | | | | | | When building against Qt 5.11.1, deleting the CMainFrame is apparently no longer doable while handling the CMainFrame::closeEvent, as it will queue a close event for the underlying QWindow. We need to perform shutdown asynchronously from the close event. Task-number: QT3DS-1922 Change-Id: I6e056fad60aa6d91eef8dcd4c147c6b47d80b220 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix datainput type issuesv2.0.0-rc2v2.0.0Miikka Heikkinen2018-06-127-18/+73
| | | | | | | | | | | | | | | - When adding a new data input the type is set correctly even if you don't touch the type combo. - When adding a new data input from popup menu for property, timeline, or slide panel, the corresponding data input is not changed if the new data input is of unsuitable type. - Correct default type is shown for each property when setting data input from inspector panel. Task-number: QT3DS-1913 Change-Id: I704cb704fb1ec9aca916ed7f7542ace404bba77c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove non-existent items from recent files listMiikka Heikkinen2018-06-112-17/+20
| | | | | | | | | | Avoids crash when trying to load such a presentation. Task-number: QT3DS-1903 Change-Id: Ic0fdd00243aed2656df248901ebbc444d829dcdd Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix backward compatibility for datainputsMäättä Antti2018-06-111-1/+1
| | | | | | | Task-number: QT3DS-1908 Change-Id: I9c855c905538920a7ef7cd75f49712a47298d4f3 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix startup dialog flickering when dragging to another screenMiikka Heikkinen2018-06-112-214/+370
| | | | | | | | | | | | | | | | It's still unclear what the actual issue was, but copying paintEvent handling from about dialog, and making the dialog form more like about dialog, i.e. adding a layout to the dialog and setting one of the QLabels to have word wrap fixes the flickering. The fact that word wrap makes a difference likely means that the root cause is some Qt bug and this might break again when Qt version changes. Task-number: QT3DS-939 Change-Id: If75f5e1d9ed57e3f72b13209a9d5fe6878371b34 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix tutorial dialog flickering when dragging to another screenMiikka Heikkinen2018-06-112-216/+248
| | | | | | | | | | | | | | | | | | | | It's still unclear what the actual issue was, but copying paintEvent handling from about dialog, and making the dialog form more like about dialog, i.e. adding a layout to the dialog and setting one of the QLabels to have word wrap fixes the flickering. The fact that word wrap makes a difference likely means that the root cause is some Qt bug and this might break again when Qt version changes. Since tutorial dialog didn't have QLabel originally, removed text from checkbox and added a separate label for it. Task-number: QT3DS-939 Change-Id: If39d73851c5f7095bf630d4fe46446b81b9b4100 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix editor copyright yearMiikka Heikkinen2018-06-081-1/+1
| | | | | | | Task-number: QT3DS-1904 Change-Id: Ia4fec2598459923c5f8cc5c2cb28a67d409584af Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Use the existing list of subpresentations to create renderable itemsMäättä Antti2018-06-081-50/+4
| | | | | | | | Task-number: QT3DS-1901 Change-Id: I3c48b9dfbfefdb8f46636e7d3f38d3585241fe55 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make sure timeline context menu appearMahmoud Badri2018-06-071-1/+1
| | | | | | | | This bug was caused by the parent commit. Task-number: QT3DS-1892 Change-Id: I15fbe4580ba676968c65afbb61bdb50f4d31d4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some property graph expansion issuesMahmoud Badri2018-06-078-103/+42
| | | | | | | | | | | | | | | Fixed the following 2 issues which happen when one or more property rows graphs are expanded: - selecting keyframes by selection rectangle - tree rows context menu targeting the correct row Also got rid of the correctIndex() method (and some related methods) which caused some limitations. Task-number: QT3DS-1892 Change-Id: I64b817d54da4a471c0ada8e74a13b61b44f5820f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Open the correct uia file for sub-presentation and data input parsingTomi Korpipaa2018-06-071-5/+13
| | | | | | Task-number: QT3DS-1890 Change-Id: Ie12ce196ea283299c830fc938eb5e6840e0647b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix component/group name uniqueness checkJanne Kangas2018-06-072-16/+25
| | | | | | | | | | | | Check new component or group name uniqueness based on the original object name, not based on default "Group" or "Component" that is temporarily assigned to the newly created object. Task-ID: QT3DS-1831 Change-Id: I23138f92cb573eca861d494403371795dfaeec1b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove ignoreHotkeys property from some control typesMiikka Heikkinen2018-06-073-5/+0
| | | | | | | | | | | | | | | | | QML Sliders and combo boxes were really only ignoring hotkeys because of arrow keys can be used to adjust them. However, arrows are no longer used as global hotkeys since the nudge functionality has been removed. It's unclear why QML toolbuttons were ever ignoring the hotkeys - only key they seem to be responding to is space, and that still works even if ignoreHotkeys is removed. Perhaps it worked differently in Qt versions prior 5.11. Task-number: QT3DS-445 Change-Id: I19d74a792d593355684f6794f377dc4c826d4733 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Autoscroll timeline tree when dragging from basic objects/projectMiikka Heikkinen2018-06-072-1/+3
| | | | | | | Task-number: QT3DS-1889 Change-Id: Ie905b74d97590c0f08fea2555a5d14c807728436 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clip RowTree icons that would overlap filter buttonsMiikka Heikkinen2018-06-071-56/+61
| | | | | | | Task-number: QT3DS-1882 Change-Id: Ia1e7c767bfdeb7763aa9fd7ce66ed418212957e2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow drag-select keyframes from an object rowMahmoud Badri2018-06-063-18/+6
| | | | | | | | Currently only possible to drag-select keyframes from property rows Task-number: QT3DS-1886 Change-Id: I6673e5ec52a73d48f0c9cd98abc7a53a63915ee0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix adjusting timebar by dragging start/end handlesMiikka Heikkinen2018-06-062-12/+19
| | | | | | | | | | | | | In case of overlapping start and end handles, now choose the handle depending on the click position relative to start of the bar. Never select start handle if end time is zero. Also allow adjusting the duration to actual zero instead of just very close to it. Task-number: QT3DS-1869 Change-Id: I57d06c6e70bb22fd320bcd01adf021a15f13caf6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Small tweaks to snappingMahmoud Badri2018-06-061-2/+5
| | | | | | | | | - Fixed some cases where snap doesn't work correctly - Update snapping after row filtering happens Task-number: QT3DS-1877 Change-Id: If92a7acef2772cade0d3140040e27c5515fadb03 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update Tutorial imagesMarianne Yrjänä2018-06-054-0/+0
| | | | | | | Task-number: QT3DS-1857 Task-number: QT3DS-1858 Change-Id: Ie86ab9464709a907b1e04eca4e9161929a643527 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Cancel DnD when Escape key is pressedMahmoud Badri2018-06-053-2/+30
| | | | | | | | | When pressing Escape key while DnD is active, it is cancelled Task-number: QT3DS-1842 Change-Id: I74fd371844617757fcdc22603cf4cf5605fe1c33 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add behavior script to update date and time in SampleProjectTomi Korpipaa2018-06-051-0/+56
| | | | | | | Task-number: QT3DS-1855 Change-Id: I8173829e093a3ca772306ced7ad46bda30e09b88 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix corrupted blank cursor during drag-adjusting floatsMiikka Heikkinen2018-06-011-2/+13
| | | | | | | | | This works around QTBUG-61678, where the blank cursor gets corrupted in multimonitor setups. Use a custom empty bitmap cursor instead. Change-Id: I629265663ec5a6074e5e58ab978dc607fae735c8 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix other mouse buttons from interfering with drag-adjust of floatsMiikka Heikkinen2018-06-013-0/+34
| | | | | | | | | | | Install an event filter that blocks all mouse button events for other buttons than the left button for the duration of the drag. Key events and shortcut overrides are also blocked. Task-number: QT3DS-565 Change-Id: Idbc03eae5e4e4e0718ebdd43066f58275bd5f44f Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Handle trivial timeline TODOsMiikka Heikkinen2018-06-0113-339/+6
| | | | | | | | | | | Went through timeline TODOs and removed ones that are no longer valid and did trivial ones. Task-number: QT3DS-1828 Change-Id: I717c4fae21bd2d95136c0cec63e4b304bbb3d24d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when the return-from-master slide is deleted while in masterMiikka Heikkinen2018-06-011-4/+4
| | | | | | | | | Need to check for slide validity before attempting to change to it. Task-number: QT3DS-1750 Change-Id: I77e93f8f8398169dd9ebf54a8fb281b16407d055 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent timer-triggered property update when value is already committedJanne Kangas2018-06-011-1/+5
| | | | | | | | | | | | Stop slider rate-limiting timer when user releases mouse button and value is committed to property system, to prevent timer triggering an unnecessary non-committing property change. Instead at button release just update the associated text field to reflect the committed value. Change-Id: Ia0587b1fa1c3860b0d07bd653d91e7dc2240c293 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix slides getting stuck on master slideMiikka Heikkinen2018-06-012-16/+11
| | | | | | | | | | | | Updating the return slide when the slide change was caused by the engine rather than user would update the return slide to the master slide itself. Changed it so that the return slide is updated every time we change to non-master slide. Task-number: QT3DS-1750 Change-Id: I105d2996265cc152782f8b1ec9fb9a5f02adf4b3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up old controlsMiikka Heikkinen2018-06-0196-17280/+20
| | | | | | | | | | Remove unused controls from Authoring/Studio/Controls and some ancillary files elsewhere. Task-number: QT3DS-1828 Change-Id: I6461112a02cc24ef0c169b3a99de26b034065040 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Correct timeline toolbar icon sizeKaj Grönholm2018-05-311-2/+2
| | | | | | | | Icons were a bit blurry, change layer icon and use 16x16 which is native resolution of all these toolbar icons. Change-Id: I9c869c5c86cd91a190ba59eb04c3d67ad266007c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old timeline codeMiikka Heikkinen2018-05-3190-10842/+27
| | | | | | | | | | | | Remove unused files and unused functionality from remaining files. Moved some still used functionality to better places. It is likely that a lot of unnecessary code still remains. Task-number: QT3DS-1828 Change-Id: I199f67e7d34acbc4d707b75502a4b54e0f9a7d02 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Only clean up meshes if they have more than 1 revisionTomi Korpipaa2018-05-313-10/+22
| | | | | | | | Task-number: QT3DS-1832 Change-Id: I35d75928fe49a82609801d7f2a7581482921d9d1 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Avoid SceneView flashing at wrong position during startupKaj Grönholm2018-05-311-1/+1
| | | | | | Task-number: QT3DS-1748 Change-Id: Iea9fd71c3c2ff1dc1cfa0d6b083ca4b90b76a89d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some DnD insertion issuesMahmoud Badri2018-05-314-18/+49
| | | | | | | | | Fix some cases where the DnD insertion mark doesn't appear although the insertion position is valid. Task-number: QT3DS-1829 Change-Id: If6ca415158282a625e57cc0ae23a8c33bd518c5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve timeline timebars adjustingKaj Grönholm2018-05-306-16/+40
| | | | | | | | | | | | | - Allow updating duration and maxDuration separately. Max duration is not updated during manual duration movement to avoid buggy behavior when adjusting right-most duration. - Draw ruler up to maxDuration and with active color up to duration. - Fix ruler update after undo/redo. Task-number: QT3DS-1789 Change-Id: I66e45aeda7e9aa5e91e7de6092d05a1d52f1c89b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix inspector button positions when moving editor between screensMiikka Heikkinen2018-05-301-2/+2
| | | | | | | | | | We can't rely Image element's sourceSize, as it can change when pixelratio changes and @2x images are used. Now we hardcode space taken by the image. Change-Id: I62faeca8dd3ae22dc42af2ada593ba4dee7194d8 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update scene renderer display scaling factor when GL view rect changesJanne Kangas2018-05-302-12/+15
| | | | | | | | | | | | Get current display scaling factor when render rectangle changes size. Fixes incorrect mouse click coordinate mapping after rescaling (Studio window moved from one monitor to another, for example). Change-Id: Id9d82775e9c11fac308085b0a7891dfa610e8d05 Task-Id: QT3DS-1673 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow moving rows at the root level inside a componentMahmoud Badri2018-05-301-4/+12
| | | | | | | Task-number: QT3DS-1821 Change-Id: Ibbb8f56faec76c14eca54fc7d3414f1d18129119 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix context menu and mouse button handling in timelineMiikka Heikkinen2018-05-301-38/+54
| | | | | | | | | | | | | | - Context menu no longer opens when drag is happening. - Non-left button presses are ignored while drag is happening, as those caused hover events to trigger. - Non-left doubleclicks do not trigger any special handling. - Non-left click + mouse move no longer can mistakenly modify m_dragging. Task-number: QT3DS-1817 Change-Id: I2ea0353ad45b7567b5e23ac22ceda7707d6b5de0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement tooltip showing timeline bar times when draggingMiikka Heikkinen2018-05-306-6/+88
| | | | | | | | Start time, end time, and duration are shown for the dragged bar Task-number: QT3DS-401 Change-Id: I6da60ca08579086d778d052015b18f37adaf34b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bind new datainput directly when added from "Add new datainput"Janne Kangas2018-05-307-9/+39
| | | | | | | | | | Binds the newly created datainput directly as controller for slide or timeline, when datainput is created using "Add New Data Input" from datainput selector dialog. Also, use appropriate window titles. Change-Id: I288286d11f8a22f5a4d97183067c8e1412ba6002 Task-Id: QT3DS-1538 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update datainput usage during editingJanne Kangas2018-05-3012-86/+150
| | | | | | | | | | | | | Implements datainput usage tracking in order for UI to have access to up-to-date binding information when needed. Highlights datainputs that are currently bound in the datainput definition dialog. Shows "no undo" warning when a datainput is deleted. Task-ID: QT3DS-1659 Change-Id: I13d2bc1131ce6a1c78166f295291fc107395a247 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Block dragging objects under locked objectsMiikka Heikkinen2018-05-301-1/+2
| | | | | | | Task-number: QT3DS-1798 Change-Id: Iceacd7b6290397ac41fdc3dc5adff97bd6bba53f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* implement DnD auto scroll, expand, and collapse functionalitiesMahmoud Badri2018-05-298-39/+162
| | | | | | | | | | | | | - While Dragging a row, hover over a container row and it will auto expand. Hover out of it and it will auto collapse. - Hover over the top or the bottom of the tree list and it will auto scroll. - While DnD is active, currently hovered row is highlighted so that auto expand/collapse is more clear. Task-number: QT3DS-1711 Change-Id: I00680bb9e8b00530b257ca7a39a9789b7b040a5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make hide/unhide to work with multiselectionKaj Grönholm2018-05-291-9/+24
| | | | | | | Task-number: QT3DS-1818 Change-Id: I6416f9d4214a67623e60627f115dc4030901bf51 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix incorrect duration jump glitchMahmoud Badri2018-05-291-2/+4
| | | | | | | | | | While dragging a row duration, at the point when the horizontal scrollbar appears, the duration bar jumps far away for 1 frame. Task-number: QT3DS-1806 Change-Id: Ia6486c87fed891c2bf555ffd18d8bcc3f2566ec9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Adjust loading popupKaj Grönholm2018-05-293-6/+29
| | | | | | | | | | Change background color & add border. Also updates correct image path and changes filename label to word-wrap. Task-number: QT3DS-1788 Change-Id: Ief46b5110e9fc54994675e9cd821849502567266 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix the initial directory for opening a presentationMiikka Heikkinen2018-05-292-12/+19
| | | | | | | | | | | Now File/Open always shows the most recently opened presentation's directory. Task-number: QT3DS-1471 Change-Id: I4038528001bdc7e597b4b4cff3cde579815679bf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up old mesh revisions from old presentationsTomi Korpipaa2018-05-295-59/+83
| | | | | | Task-number: QT3DS-1790 Change-Id: I988a3f09ee4a9daaa4ce3dd08e2ae56850964cb0 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Add tooltips in timeline palette iconsKaj Grönholm2018-05-293-1/+50
| | | | | | | | | Also show mouse hovering there for improved UX. Task-number: QT3DS-270 Change-Id: I78e5ac228031e28cbd15e7f20c546281c14abb62 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix double headers and remove unused from Qt3DStudio.proMäättä Antti2018-05-291-96/+0
| | | | | Change-Id: I4c98501ffb5dc89dab91d5f6b63c0968c7fd2014 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 03:51:42 +0000