summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/MainFrm.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Implement timeline rows filtering based on variants filterMahmoud Badri2019-04-011-4/+9
| | | | | | | | Plus assorted small tweaks. Task-number: QT3DS-3225 Change-Id: I127fc7f356b7d63eaffc3137679552db4d42f11a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge branch '2.3'Miikka Heikkinen2019-03-291-1/+6
|\ | | | | | | Change-Id: Ide0635942cd89a5e07c0a558a0d5488e04536544
| * Fix variants filter dialog close issueMahmoud Badri2019-03-271-1/+2
| | | | | | | | | | | | | | | | | | Only close the variants filter dialog upon loosing focus if the tool bar variants filter button is not under the mouse. Task-number: QT3DS-3227 Change-Id: Ie90b76e5e0183f82bde18d93e484d822ec536732 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Reset the variants filter on new presentationMahmoud Badri2019-03-271-0/+4
| | | | | | | | | | | | | | Task-number: QT3DS-3230 Change-Id: Ib5a9b2ec48db014169fbe9a632be1fd28dac2209 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Revert "Remove legacy viewer"Miikka Heikkinen2019-03-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4193fc4f00c2e687ca82de589603c7fa133bff50. Also made the legacy viewer button show up by default. The viewer doesn't currently show materials correctly, that will be fixed in a separate patch. Task-number: QT3DS-3198 Change-Id: I079eb31d9240abde496d91edc9f5611c3fbbe6a7 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Tweak camera selectorMahmoud Badri2019-03-221-19/+6
|/ | | | | | | | - Removed useless code - Some cleanups Change-Id: I92433ae375026d8f0acbf7d8a4731f65a6ef3ebd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Correct timeline playback buttonMahmoud Badri2019-03-191-3/+2
| | | | | | | | 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-191-173/+20
| | | | | | | | 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>
* Make the menu bar and tool bars focusable by mouse clickMahmoud Badri2019-03-181-11/+0
| | | | | | | | | | ...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>
* Improve several parts of the variant tags featureMahmoud Badri2019-03-141-18/+15
| | | | | | | | | | | | | | - 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>
* Implement variants filtering dialogMahmoud Badri2019-03-121-2/+66
| | | | | | | | | | | 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-111-2/+2
| | | | | | | | Adjust logic to match this behavior. Task-number: QT3DS-2673 Change-Id: Ib3519e1abc10086469de767c3427f3864609fb5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants UI on the slide viewMahmoud Badri2019-02-211-0/+7
| | | | | | Task-number: QT3DS-3087 Change-Id: Ie402e48d2a948bde32388d0ea4c4245a87e94e21 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement 'save project as' and 'duplicate presentation'Miikka Heikkinen2019-01-101-24/+14
| | | | | | | | | | | | | | 'Save project as' creates a copy of the existing project and allows optionally opening the copy in the editor. 'Duplicate presentation' copies the active or targeted presentation into the same folder as the original presentation. User must supply the new name, but the id is autogenerated. Task-number: QT3DS-2630 Change-Id: I13e1cffd0b9d2705fbab7ca72b9dd1f5d0691e77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash on macOS when using menu during startup dialogTomi Korpipaa2018-12-051-16/+20
| | | | | | Task-number: QT3DS-2828 Change-Id: I5637d4b7acb3ea42bc872a4ef23e579d64ed1e15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide broken 'save as' and 'save copy' functionalityMiikka Heikkinen2018-11-291-2/+7
| | | | | | | | | | | | | This functionality requires redesign and reimplementation, as it is currently useless and broken. Disabling it until it can be properly fixed. Task-number: QT3DS-2749 Change-Id: I35698293e4fd91d3469fc75631a23054cf81b544 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove empty functionMiikka Heikkinen2018-11-221-6/+0
| | | | | Change-Id: Ia704ef30180e01188e55b10cd528a8d5f58e1658 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement scene camera tabMiikka Heikkinen2018-11-021-0/+17
| | | | | | | | | The scene camera tab on the bottom dockable area provides a zoomable pixel perfect view of the scene camera. Task-number: QT3DS-709 Change-Id: I7d96464e8208b9e57a1bd980fc6b71656028e49a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash on exitTomi Korpipaa2018-10-171-0/+6
| | | | | | | | | | | | | | Saving preferences failed on macOS, causing the crash. Now preferences are saved each time preference dialog is closed, or a recent item is added or changes. Also changed the preference folder into a more describing one instead of the old Qt3DSComposer, which is not used anywhere else in code or docs. Task-number: QT3DS-2499 Change-Id: I1f725e246c3fd491aa9600ddf0503e96af6ed1de Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Change many CStrings to QStringMahmoud Badri2018-10-101-19/+16
| | | | | | | | | | | | | | - A lot of CString, CFilePath, and Qt3DSFile occureneces and their relevant code has been removed to save the costy back and forth conversion between CString and QString. - Renovated several classes as part of the process (Preferences classes, recent items, build configuration, probably few more) - Assorted tweaks here and there Task-number: QT3DS-1899 Task-number: QT3DS-2455 Change-Id: Ibbf4c3b7ab0b9fe6e19d8aed822fa29d43b99086 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Register needed Titilliumweb fontsMiikka Heikkinen2018-09-201-0/+5
| | | | | | Task-number: QT3DS-2373 Change-Id: Ib6f85ac884ee4a3a1424bc2db88fd2df5e7a924e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update welcome screenMiikka Heikkinen2018-09-201-4/+5
| | | | | | | | | | Welcome screen is now simply a single screen instead of a multi-screen tutorial. A button was added to open getting started documentation. Note: Font family is not correct, to be fixed later. Task-number: QT3DS-2239 Change-Id: I98e8d07d72ce33c433a187d989f36d10d09a4ec8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove legacy viewerTomi Korpipaa2018-09-101-12/+0
| | | | | | Task-number: QT3DS-2291 Change-Id: I0a11dfc1d69e4844e67476b60bc40da99c6ad12a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow opening non-project .uip files with editorMiikka Heikkinen2018-09-041-0/+4
| | | | | | | | | | | | If .uia is not found, .uip is still opened and can be used. If something is done that needs to write to .uia, then .uia is created. Task-number: QT3DS-2178 Change-Id: If915c26da686d06f043e0409931971a707a434a2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix miscellaneous settings issuesMiikka Heikkinen2018-08-301-1/+0
| | | | | | | | | | | | | - Clearer values for timeline snap options - Clearer tooltip for legacy viewer - Removed edit view background color setting, it is no longer needed with the gradient background Task-number: QT3DS-2148 Change-Id: I7c4cebf49c339e7809023f0500116deff45e2f70 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement scene lighting toggleMäättä Antti2018-08-011-4/+19
| | | | | | | | Task-number: QT3DS-1653 Change-Id: I6b9f4c2461ae7371603d3e721a965f9c9cb520f0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Implement scene view preview in edit modesMäättä Antti2018-08-011-0/+14
| | | | | | | | Task-number: QT3DS-250 Change-Id: Iaf7bf245ebf3de00339f5cbfb0f9fc2d4f099373 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add presentation id to the presentation settings panelMahmoud Badri2018-07-261-19/+0
| | | | | | | | | | | | | | | | | | | | | | - The presentation settings panel appear after creating a new presentation - The presentation settings panel now show the presentation Id (for the currently open presentation) - Added logic to make sure the presentation id remains unique - Added a command prompt option (--add) to add a presentation to project, if the option is absent, a new project is created - Added a context menu 'edit presentation id' action to the presentation items in the project palette - removed the sub presentations menu option and dialogue - Added the ability to import a presentation. This will also import all presentations related assets (images, models, fonts...etc). If an asset already exists a message box is displayed so that the user can choose whether to override or skip the file. The only missing thing is that subpresentations are not imported. This part is to be discussed and/or implemented in a separate task. Change-Id: I9fa96227efa82b4cef90615f1f069530419db7b6 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Initial work in the project/presentations handling tasksMahmoud Badri2018-07-041-4/+10
| | | | | | | | Check task description for details. Task-number: QT3DS-1950 Change-Id: Ibf3e235d8fc8c622a87c42399107f9ccb01a851d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix restoring the layout at program startMiikka Heikkinen2018-07-031-3/+6
| | | | | | | | | | | | | | Restoring both geometry and window state back to back results in state not being restored properly. Changed the state restoring to be done asynchronously to fix the issue. Also, there is no need to do the layout save/restore on every show and hide. Task-number: QT3DS-1710 Change-Id: I042362ea40d4a8c01e3f8c00a09257cd5483cbd7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for grouping and ungrouping selected itemsMiikka Heikkinen2018-06-291-4/+17
| | | | | | | | | | | | Ctrl-G will group 2 or more selected items under a newly created group item. Same shortcut when an single group is selected will move the group's children up one level and delete the group. Task-number: QT3DS-1283 Change-Id: Ife0fa6f0c35a4d37f7e76c7233e79c9f38d98a02 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix edit menu itemsMiikka Heikkinen2018-06-271-34/+24
| | | | | | | | | | | | | | | | - Show what is about to be deleted/duplicated - Properly enable delete/duplicate items - Action delete/copy/cut/paste is now fully contained in action view - Every view and player window indicates when they are activated (i.e. mouse is pressed on them) so we can track the context reliably even when menu steals the focus. Required for slide duplicate/delete enabling in edit menu. Task-number: QT3DS-1911 Task-number: QT3DS-1958 Change-Id: Icf0bb173809740dd709b9e0525735de7aecba617 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix editor crash at shutdownMiikka Heikkinen2018-06-151-1/+1
| | | | | | | | | | | | | 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: I557d5788591ccc1359cf0d1a4ff35e153e2fe5a6 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@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 shortcut delete of slidesTomi Korpipaa2018-05-231-1/+6
| | | | | | | | Task-number: QT3DS-1747 Change-Id: I2139057dc505c82adda4278f292608b2513ef0c6 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>
* Restart Studio if settings that require a restart are madeTomi Korpipaa2018-05-221-2/+13
| | | | | | | | | | Previously we just told a restart is required (for settings changes), or exited after showing a dialog. Replace both options with actual restart. Task-number: QT3DS-1742 Change-Id: Ie86a618b00f9e24af638bba36efbecb1de1d6760 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shortcut duplicate for slidesTomi Korpipaa2018-05-151-3/+8
| | | | | | Task-number: QT3DS-1642 Change-Id: Id9889608588b32d0983bcfabdc202d7fb5fcb276 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make sure scene is visible before opening presentationKaj Grönholm2018-05-151-3/+10
| | | | | | | | | Fixes potential crash on startup. Task-number: QT3DS-1664 Change-Id: I28dfc1490fec136b2dbea7120da5b7b2efb851ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show instruction text if user exits startup dialogTomi Korpipaa2018-05-141-1/+7
| | | | | | | Task-number: QT3DS-1639 Change-Id: Ic5f48b97e008c97a435e9eb90447cec0acea7d0c Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide unimplemented menu itemsTomi Korpipaa2018-05-141-0/+9
| | | | | | | | Task-number: QT3DS-1641 Change-Id: I87670ea6aaa4ec49907f991f9bbb3362e977b098 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make runtime2 viewer as default viewerMarianne Yrjänä2018-05-141-7/+12
| | | | | | | | | | | Make runtime2 viewer as default and hide runtime1 preview option. Runtime1 viewer can still be enabled from studio preferences. Task-number: QT3DS-1583 Change-Id: I70bc8403ad9db776c609d251846da6f9b8fc4485 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support drag&drop objects into timelineMahmoud Badri2018-05-091-2/+4
| | | | | | | | | | Implement dragging items from the "Basic Objects" and project assets to the timeline tree part. Task-number: QT3DS-1455 Change-Id: Iafb58d647221c63dcaa5ac9cced3ab9ee8de2a68 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix reset layout crashMiikka Heikkinen2018-05-071-1/+1
| | | | | | | | | | | Close the editor asynchronously to give things time to properly clean up. Task-number: QT3DS-1574 Change-Id: I2b4d25f84a7a852b32d821af56052334b6cbe485 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support multi-selecting timeline rowsKaj Grönholm2018-05-031-34/+2
| | | | | | | | | | | | | Allow (de)selecting multiple rows by keeping Ctrl/Command key down. Support deleting multiple rows and changing multiple row bar colors. Moved behavior from bindings into timeline side as bindings API was designed to change only single bar color with or without undo. Task-number: QT3DS-1454 Change-Id: I6a68fdef38aa6939526e66eed39eb5c33129616c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement more missing timeline shortcutsMiikka Heikkinen2018-04-301-5/+0
| | | | | | | | | Also did some cleanup of related things. Task-number: QT3DS-1452 Change-Id: I65dccc7325d2aba8ab6294a3d3c8272722182272 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support custom timebar colorsKaj Grönholm2018-04-271-6/+8
| | | | | | | | | | | Support setting custom bar color. Switch using colors from StudioPreferences. Selected bar highlighted with overlay like in current timeline. Task-number: QT3DS-1442 Change-Id: I4673f4776c7d7048bf573f40aa237258b011e9d2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support setting animation interpolationKaj Grönholm2018-04-261-3/+2
| | | | | | | Task-number: QT3DS-1433 Change-Id: Icbe36d5af69559dba043de3aaa954955688b1970 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/master' into wip/timelineMiikka Heikkinen2018-04-231-108/+113
|\ | | | | | | Change-Id: I58176ea495831aee6eb35b9057bdecb6f3a6e1fe
| * Add "Reset Layout" button to preferences dialogTomi Korpipaa2018-04-191-80/+89
| | | | | | | | | | | | | | | | | | | | | | Fixed some memory leaks to prevent crashing at application close, especially when closing after resetting layout. Cleaned up function and variable naming on most of the files edited. Task-number: QT3DS-1423 Change-Id: Idb6e20a140ecc26af972a27b45a2419026374b0c Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add command line option to create a presentationTomi Korpipaa2018-04-131-22/+22
| | | | | | | | | | | | | | | | | | | | Repurpose "silent" option for creating new presentation without starting UI. Remove "test" option, as it does nothing. Task-number: QT3DS-887 Task-number: QT3DS-1421 Change-Id: Ic080905fdf5cf5f329778875aadfcbbbc936f8fa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 04:11:25 +0000