summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix master slide item grouping issuesv2.3.0-rc2Miikka Heikkinen2019-03-267-20/+54
| | | | | | | | | | | | Disallow grouping mixed non-master and master items. If master items are grouped, the resulting group is a master group. Disallow dragging master items under non-master items in some edge cases that still allowed it. Change-Id: Id4e18405526fb5b0f9ed17bc29e758101a19875e Fixes: QT3DS-3224 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update images in documentationMats Honkamaa2019-03-2625-0/+0
| | | | | | | Task-number: QT3DS-3123 Change-Id: I1ec5dfe145800de2de39e617a26b95ae59b53c3c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disallow grouping of ungroupable itemsMiikka Heikkinen2019-03-261-1/+28
| | | | | | | | Change-Id: Ifdcfb6020fd2f712ea3f9a35785755bd47f42c41 Fixes: QT3DS-3220 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Delete guide if it is moved off-presentation via inspectorMiikka Heikkinen2019-03-263-3/+32
| | | | | | | Change-Id: Ifd8188da43d334e315df2e9b6be6768953c6f1e7 Fixes: QT3DS-3222 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix drag-adjusting float fields when shift or ctrl is pressedMiikka Heikkinen2019-03-261-0/+4
| | | | | | | Change-Id: I78d9edcb79f942893738864ddb5550aa5d15eb9f Fixes: QT3DS-3221 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix property categoriesMiikka Heikkinen2019-03-261-11/+11
| | | | | | | | | | Some properties were missing from the inspector due to missing category attribute. Task-number: QT3DS-3217 Change-Id: I110375a41e1282fcfd8e98d00692115cd38b39b3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove unused Layer basic properties from inspectorMahmoud Badri2019-03-221-9/+18
| | | | | | | | | | Fix a regression caused by: commit (7e468f5d90c942da45724f06396349b271db0302) that caused Layers to show unused basic properties (move, rotate, scale, etc) Task-number: QT3DS-3214 Change-Id: Ic1ece4e84f389673824ecdc6db6505b97ea67f2d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtime submodule for 2.3.0 RCv2.3.0-rcAntti Kokko2019-03-221-0/+0
| | | | | | Change-Id: I9e08dddbfc2e104c359e01448db555fc19d5045b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash after changing the startup viewMahmoud Badri2019-03-212-0/+17
| | | | | | Task-number: QT3DS-3194 Change-Id: I6be9a6ca881b354ba3890effb78d42604ba2d94b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't create duplicate variant groups on importMiikka Heikkinen2019-03-211-4/+7
| | | | | | | | | Also don't update color for already existing groups. Task-number: QT3DS-3192 Change-Id: I0e81e351df26ffa11d66c9b2deca6b403caa6103 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Save preferences when accepting the restart requestMiikka Heikkinen2019-03-211-1/+3
| | | | | | Task-number: QT3DS-3190 Change-Id: I7b490dfd41d4af76aebba51efdef4acdb6f52377 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix variant group label width when it is just above previous maxMiikka Heikkinen2019-03-211-2/+2
| | | | | | Change-Id: I618d47d0b84c9ef168c4cdb960384de4728acb6e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve variant filter dialog user experienceMiikka Heikkinen2019-03-211-20/+13
| | | | | | | | Added highlight when buttons are pressed to variant filter dialog. Change-Id: I113acf895aad06e6f8ad8a60faefab25f6e3f247 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix the dialog size issues for tag edit dialogMiikka Heikkinen2019-03-212-2/+4
| | | | | | | | | | In some environments title bar was too short and height was bit too small. Also, dialog shouldn't be resizable. Task-number: QT3DS-3170 Change-Id: I032599734fca317ce47e2799f99cc5ca102222ae Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add inspector groups for Text and LightMahmoud Badri2019-03-201-462/+470
| | | | | | | | | Text: basic properties, format, and shadow Light: basic properties, light properties, and shadow Also removed the double indentation of the metadata file lines. Change-Id: Ibc065a7418905ddb7917fc3436c0e40c7542fd39 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve timeline playback/scrubbing performanceMahmoud Badri2019-03-204-86/+35
| | | | | | | | | | | | Inspector model was being refreshed on every time change. Removed this unnecessary model refresh and corrected an issue so that inspector is updated on every property change. This greatly improved playback performance. Also removed few other unneeded code and some cleanups along the way. Task-number: QT3DS-3184 Change-Id: I77606b52239c8bfbcf235ebfd1189ba45acc2abb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix text alignment with fixed size text areaTomi Korpipaa2019-03-201-2/+5
| | | | | | | | Task-number: QT3DS-3137 Change-Id: Ia28d42d1edc59ac6e24879aba340e0509c4d5c07 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename "qml streams" folder to "qml"Tomi Korpipaa2019-03-206-6/+6
| | | | | | | | Task-number: QT3DS-3182 Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow dropping on entire timeline row if insertion above is invalidMiikka Heikkinen2019-03-202-6/+24
| | | | | | | | | | This improves user experience when dragging things under scene or the topmost layer. Task-number: QT3DS-2652 Change-Id: I278504f1da14fa47941f8fa1b5d931b68b267958 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix tab order in some dialogsMiikka Heikkinen2019-03-193-1/+20
| | | | | | | | | Add Data Input dialog also resized a bit to fix clipping issue. Task-number: QT3DS-3180 Change-Id: I657ff10d40c97c30f346ddeea985a5569bb4657d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Correct timeline playback buttonMahmoud Badri2019-03-1922-27/+30
| | | | | | | | The timeline toolbar playback button had a wrong icon as it shares the same icon with the preview button. Also some image name cleanups. Change-Id: Id7a1414084d883aa86fc0395282cae2412907641 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix the clutter delay when clicking a move, rotate, or scale buttonMahmoud Badri2019-03-192-198/+30
| | | | | | | | Also some clean ups in the MainFrm class Change-Id: Ic795a6adcdfb7c728a4058d7cb4ca887e1c4eea9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix copyright year in editor about dialogMiikka Heikkinen2019-03-191-8/+1
| | | | | Change-Id: I6405aadff46da40f5c92ff21d07e764197313329 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Increase size of EditPresentationIdDlgMiikka Heikkinen2019-03-191-2/+2
| | | | | | | | | In some cases the title gets cut off or controls are slightly squished vertically. Increasing the dialog size a bit should fix these issues. Task-number: QT3DS-3170 Change-Id: I9329ff92fdbddad7842db2e30e5026513374a864 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix docs about text drop shadowsTomi Korpipaa2019-03-191-2/+1
| | | | | | | | Drop shadows are now supported with distance field rendering as well. Change-Id: Ic8aeefadd3a201e048355a3bb5f3f8e752ec9541 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't try to open duplicated .qml files as presentations in editorMiikka Heikkinen2019-03-181-2/+2
| | | | | | | Task-number: QT3DS-3172 Change-Id: Ic1e3f34cbf9c7ff6ffe241ad7f305e9c51c86b2b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Make the menu bar and tool bars focusable by mouse clickMahmoud Badri2019-03-183-13/+15
| | | | | | | | | | ...so the variants filtering dialog (and other dialogs) closes upon clicking any point on the menu bar or tool bars. - Also removed 2 useless methods. Task-number: QT3DS-3115 Change-Id: I8ce9d0b6205567efbdcfbf7294ccc737d140f670 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qml asset import on non-windowsTomi Korpipaa2019-03-181-0/+4
| | | | | | | Task-number: QT3DS-3007 Change-Id: I0205c06e4015383a1778ffc9eae440b9d9b46964 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Show tags names in dark color when when group color is brightMahmoud Badri2019-03-189-6/+111
| | | | | | | | Applies to the inspector and filter dialog Change-Id: I668bb905b171cb96f83f1da7bfd20c1fd672dd18 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix docs to match current runtime behaviorMiikka Heikkinen2019-03-181-2/+3
| | | | | | | Task-number: QT3DS-2720 Change-Id: I1bb3d7cdaf8edd41909868e6a697caa269aa48f5 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Commit open transactions when launching a preview viewerMiikka Heikkinen2019-03-181-0/+4
| | | | | | | Task-number: QT3DS-3070 Change-Id: I47f552cd4e643fb8276582eb0701c6dc74306a0e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent special characters in variants group/tag namev2.3.0-beta3Mahmoud Badri2019-03-151-0/+5
| | | | | | | Only underscore is alloweed. Specifically , and : are problematic. Change-Id: Iaddcd7f1476c6377236ecce51512b055616a3f7d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disable breakpad on macOS and LinuxPasi Keränen2019-03-151-1/+2
| | | | | | | | | Breakpad causes issues with macOS and Linux builds, as a quick patch disable it. Task-number: QT3DS-3164 Change-Id: I2b94850f6be53cd2b36280c285d8cafc3aeffe77 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Show warning instead of empty popup when there are no valid refmatsMiikka Heikkinen2019-03-153-19/+33
| | | | | | | Task-number: QT3DS-3141 Change-Id: I4f3c87af213199bd4b743b79b36b79e2d5c4d09f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Refresh variant indicators on slide view when presentation is loadedMiikka Heikkinen2019-03-151-0/+2
| | | | | | | Task-number: QT3DS-3154 Change-Id: Icdaa192f3e6a4b66a555ee9409db9fab829ebc49 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Default edit camera picture-in-picture scene preview to offMiikka Heikkinen2019-03-151-1/+1
| | | | | | | | Scene camera tab is much better for most use cases. Change-Id: I288b3b78730ab32cf387fa8950d6b4f45030f293 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix a 'select master slide' crash related to variantsMahmoud Badri2019-03-152-18/+15
| | | | | | Change-Id: I248f49df0993f61a1ffe8e38e27264dd8d5554cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix variant label cropping on macOSTomi Korpipaa2019-03-151-2/+2
| | | | | | | Task-number: QT3DS-3163 Change-Id: I91d943070f4ed425e8763c56f1f8bec7b7d46288 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtime submoduleMiikka Heikkinen2019-03-151-0/+0
| | | | | Change-Id: Ia1321fa5672e37f4fec67ce7a628fe44d8bf295a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prompt for saving the current presentation when duplicatingMiikka Heikkinen2019-03-151-1/+1
| | | | | | | | | | | Duplicating a presentation will always load the newly created duplicate, so we have to always perform the save prompt and not just when current presentation is duplicated. Task-number: QT3DS-3148 Change-Id: I9341c578a1c460dfd8981659edb2f4efbfb98c5d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve several parts of the variant tags featureMahmoud Badri2019-03-1415-65/+120
| | | | | | | | | | | | | | - Update slide view variants tooltip immediately upon tag/group rename. - Fix flicker upon first showing of the filtering dialog. - Word wrap the "empty variants" hint text. - Preserve groups addition order (in inspector and filter dialog). - Use predefined colors for newly created groups. - Add a border around tags in the timeline rows. - Other minor relevant tweaks. Task-number: QT3DS-3114 Change-Id: I2b345f94784fefda5fa1a004bb73dccbad2ddae9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Delete preview uip/uia only when no viewers are openKaj Grönholm2019-03-142-7/+27
| | | | | | | | | | | | When user opened multiple viewers or opened viewer before previous had been properly cleaned, cleanupProcess() ended up deleting preview uip/uia still in use. Instead, keep count of open viewer instances and delete only when none are open. Task-number: QT3DS-3151 Change-Id: Ia0d434d42aa787b301476952e71b555d1f96233a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update variants slide view UIMahmoud Badri2019-03-143-10/+15
| | | | | | | | | Make variants appear as squares instead of numbers in the slide view. Task-number: QT3DS-3087 Change-Id: If5857a9cfd20ce00e00b33a09bc71f3881946d77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refresh variants asynchronouslyMiikka Heikkinen2019-03-142-3/+11
| | | | | | | | | | | Synchronous refresh when deleting slides caused a crash. Asynchronous refresh is also much more efficient when deleting/undoing deep object trees. Task-number: QT3DS-3146 Change-Id: I9f63f0edb44e6f557a77132eeaaa9c76df868ce6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix cursor issues with drag adjusting float fieldsMiikka Heikkinen2019-03-134-19/+70
| | | | | | | | | | | | | | Now properly account for the screen when setting the mouse position. Also use the center of the parent widget for reference point instead of the center of the main screen. This fixes an issue where cursor sometimes resets incorrectly to what the scene view needs instead of the default arrow after the drag. Task-number: QT3DS-3144 Change-Id: Ia1b5c5244ae89bcc57ccd946fbb007beb40a8975 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement variants filtering dialogMahmoud Badri2019-03-1237-48/+799
| | | | | | | | | | | Implement variants filtering toolbar action, when clicked it shows the filtering dialog where the user can choose the tags to be used by the viewer. Also update the 'preview on remote device' icon. Task-number: QT3DS-3115 Change-Id: I4d93c8cefe94726f1f04aa6fc7e6f9f07fb8a8b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow grouping of single objectsKaj Grönholm2019-03-113-7/+7
| | | | | | | | Adjust logic to match this behavior. Task-number: QT3DS-2673 Change-Id: Ib3519e1abc10086469de767c3427f3864609fb5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve texture documentationMats Honkamaa2019-03-082-102/+12
| | | | | | | | | | | There was some information about textures under the Importing 3D Assets page. A lot of this information is already in other parts of the documentation so I removed those parts. Other parts were moved to material documentation where it belongs. Task-number: QT3DS-2494 Change-Id: Ia09019fabf0e388f209ae0de065a2c6331599d1b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't delete rows when editing textKaj Grönholm2019-03-081-1/+2
| | | | | | | | Pressing del to not delete row while user is editing element name. Task-number: QT3DS-3110 Change-Id: Ifb98407dd9627ab3a93e720b6a7b42ecad1c6314 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix datainput metadata APIJanne Kangas2019-03-077-176/+281
| | | | | | | | | | | | Add QHash map for metadata and implement UI in datainput management dialog for specifying metadata table. Metadata keys and values are stored in UIA file under "metadata" tag, delimiter-separated by '$' chars. Requires corresponding changes on Runtime side. Change-Id: I335ed893984208dcad3171357feb2e485bafea3b Task-id: QT3DS-3046 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 13:13:27 +0000