summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Action/ActionView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-101-1203/+0
| | | | | | | | Module config change so that ogl-runtime builds from submodule. Task-number: QT3DS-3600 Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Some Doc class clean ups (non exhaustive)Mahmoud Badri2019-05-181-6/+6
| | | | | | Change-Id: I98554bdb805df0e2418f44f8c9d6e0040b160f8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Support alpha channel initial workMahmoud Badri2019-05-021-10/+0
| | | | | | | | | | | In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix cursor issues with drag adjusting float fieldsMiikka Heikkinen2019-03-131-0/+2
| | | | | | | | | | | | | | 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>
* Use default initialization of instance handleMiikka Heikkinen2018-12-141-1/+1
| | | | | | | | | Default initialization is better as it'll make Valid() call work right. Change-Id: Ia2b0dda50a5f66048d2033e102cad7605818f125 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clear action view selection when no object is selectedMiikka Heikkinen2018-12-141-2/+2
| | | | | | | | Task-number: QT3DS-2847 Change-Id: I858382df23d67ea0c920f60e6fdd3e3bfecfd2cf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Track selection properly on chooser dialogsMiikka Heikkinen2018-12-131-43/+114
| | | | | | | | | | | | | Doing undo/redo while chooser dialogs are open now updates the values correctly or closes the dialog if underlying model changes in response to undo/redo. Also fixes various related issues like extra transactions that would occur on programmatic selection change. Task-number: QT3DS-2670 Change-Id: Ia6a64abed2f7fe5a615e1d52ce83794d7e89cce1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Close active chooser dialog when it goes out of contextMiikka Heikkinen2018-12-101-0/+30
| | | | | | | | | | | | | | A chooser is considered out of context when the property the chooser was opened for no longer has visible control for it. This change should ensure that user can never interact with invalid properties via the chooser dialogs. Task-number: QT3DS-2836 Change-Id: I6fca811cfccda0b0b4fbc0feb17935c3949f4f9f 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 segfault on LinuxTomi Korpipaa2018-11-301-1/+1
| | | | | | Task-number: QT3DS-2675 Change-Id: Ie388cdd1f87efc97b1a0da7064851a0ad9054fca Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up StudioUtilsMiikka Heikkinen2018-10-181-12/+12
| | | | | | | | | | | Made StudioUtils a class of static functions instead of global functions. Also cleaned up the code a bit where changes happened because of this change. Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge branch '2.1' into masterMiikka Heikkinen2018-09-251-7/+5
|\ | | | | | | Change-Id: Idfecbefcf5c1e279093f250a4a46d57f2a518d25
| * Disconnect action browser dialogs before initial selectionMiikka Heikkinen2018-09-141-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the browser dialog had been shown to another instance previously, the selection change connection would still point to wrong instance at the time the initial selection was set to the shown dialog. This would either trigger property change on wrong instance or crash if the instance was no longer valid. Task-number: QT3DS-2318 Change-Id: Ia7afac2b25c4e389e1ced698486240ffdc65b7de Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Fix switch-cases not handling all possible valuesPasi Keränen2018-09-111-1/+5
|/ | | | | | | | | | Add default handling for switch cases missing it and remove the switch case related warning suppression with clang builds. Task-number: QT3DS-2243 Change-Id: Ib87d51468bbfa00284c6849363751ccb056f7eb7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix color selection issuesMiikka Heikkinen2018-08-171-8/+2
| | | | | | | | | | | | - Color dialog selection only affects the selected property - Timebar color setting is now actually committed - Canceling color dialog when setting color property value in action palette now restores the old color Task-number: QT3DS-2080 Change-Id: I67f6869f59c1840d76edcbaff5f9026cb3e00194 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix TimelineWidget QColorDialog leakTomi Korpipaa2018-08-101-1/+3
| | | | | | Task-number: QT3DS-2057 Change-Id: I6b2456b20cb853d5d6a054abed976b18d721b5e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix macOS ColorDialog crashTomi Korpipaa2018-08-091-0/+14
| | | | | | | | | | Got rid of the QML ColorDialog altogether, as this functionality now replaces the old functionality fully. Task-number: QT3DS-2043 Change-Id: Ia48cc996a6a4df634b29d8dba360b66f896f9510 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix edit menu itemsMiikka Heikkinen2018-06-271-13/+38
| | | | | | | | | | | | | | | | - 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 action palette issuesMiikka Heikkinen2018-06-211-2/+31
| | | | | | | | | | | | | | | | - Always show correct property and value when action is selected - Clear selected action on item change - Use alias for slider type so that it actually works - Initialize sliders to minimum value instead of zero - Don't try to assign invalid value to any property handler during changing of targeted property Task-number: QT3DS-190 Task-number: QT3DS-1944 Change-Id: Iae495996ab743ef92e348109303c1d4ab6fa26b4 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 object name update on action paletteMiikka Heikkinen2018-06-181-3/+6
| | | | | | | | | Task-number: QT3DS-1119 Change-Id: Ia47e111126552241a0b13917485245f75dd3d6c3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix tooltips and shortcut displayMiikka Heikkinen2018-05-151-5/+5
| | | | | | | | | | | - Added missing shortcuts to tooltips - Added missing tooltips - Unified popup menu shortcut display format Task-number: QT3DS-176 Change-Id: I3ee34c97764f0e0b4d67523b7ce3311945f926ee Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix issues with popup positioningMiikka Heikkinen2018-05-071-31/+11
| | | | | | | | | | | | | | | | - Unified various showBrowser functions under CDialogs as showWidgetBrowser - Fixed showWidgetBrowser logic to correctly determine browser popup position in all screens - Fixed startup dialog position when editor is maximized and on a secondary screen - Removed a few superfluous global utility functions. Task-number: QT3DS-1545 Change-Id: Ia8c526d14d8b15b649600d71474f1ba29657c00e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add action palette shortcutsTomi Korpipaa2018-03-271-109/+191
| | | | | | | | Task-number: QT3DS-1371 Change-Id: Ibe59af643d8388fc6bcae2b8866cf15c356c1184 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix tooltips view menu itemTomi Korpipaa2018-03-231-1/+6
| | | | | | | | Task-number: QT3DS-1320 Change-Id: If50eb65bcae06eecc52fd9b4ca20fb28016c9a5a Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Allow Action trigger/target selection outside componentJanne Kangas2018-03-191-2/+2
| | | | | | | | | | | | Enables choosing trigger/target objects for Actions from the entire scene graph for the active slide. Also recreate Alias reference selection list when user enters/leaves a component. Change-Id: I3b66bf6a93296b5fef6168f1de8341bdd1284b11 Task-id: QT3DS-1278 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Force updating fields when action is removedKaj Grönholm2018-03-141-0/+1
| | | | | | Task-number: QT3DS-944 Change-Id: I3fe3ca2898b90872403639de20470295ace08c24 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crashing on layer action changeKaj Grönholm2018-03-121-2/+5
| | | | | | | | | | Make sure propertymodel name & value handles are always up-to-date. Also, valueHandleChanged() signal was never emitted. Task-number: QT3DS-1245 Change-Id: Id6772c3013684a997433323d00bb1d29c0656044 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Enable pasting action without existing actionsJanne Kangas2018-03-021-9/+11
| | | | | | | | | | | In action panel, leaves some empty space to right-click and open context menu for copy-pasting an action without any existing actions in the list. Task-ID: QT3DS-956 Change-Id: I9cca3d5126c500cce5afdceec21e006615e50dcb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix action panel references for relative pathsJanne Kangas2018-03-021-15/+28
| | | | | | | | | | | | | | | | | UI panel incorrectly showed absolute paths even if user selected relative path as reference type. Also, fixed references being reset from "Unknown" to action owner object after pasting an action, opening the object reference selector and closing it without making a selection. Fixed actionview not updating reference type when changed from object selector. Note that UIP file might still save path references in notation "#name" if the object name is unambiguous, regardless of what is shown in the object selector dialog. Change-Id: I68a79d2f52cc6b1ed04f2b5b60f10a057dc52360 Task-id: QT3DS-153 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix object deletion action panel crashMiikka Heikkinen2018-02-061-6/+73
| | | | | | | | | | | | | | | Crash was caused by trying to access a deleted action in action system when the delayed update to ui contents was handled. Shortened the delay to make it harder for user to interact with UI during the delay, and also made all action view operations check if item is actually still valid. Also added explicit deletion listener to catch deletions from undo/redo. Task-number: QT3DS-922 Change-Id: I469a33541af734f1565711b963100a2b99aa3992 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Keep popups inside screenTomi Korpipaa2018-01-261-5/+17
| | | | | | Task-number: QT3DS-76 Change-Id: I56957722d30ec943cc3a25bd42fb246233bf0650 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update default layoutTomi Korpipaa2017-12-141-2/+3
| | | | | | | | | Default layout is now mostly done in percentages of the main window size. Task-number: QT3DS-544 Change-Id: Ia09eab021da2667afba0dfdfb1e22e18755914a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refactor .pro file structureMiikka Heikkinen2017-11-031-1/+1
| | | | | | | | | | | | Moved various .pro files under their respective subdirectories, so they don't all build their object files into same directory, potentially causing conflicts. Also fixes the issue with missing Qt3DStudio target. Task-number: QT3DS-294 Change-Id: I6a8ffc6a596d65e39c1fde21b4157c86a91581d0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix event browser initializationMiikka Heikkinen2017-10-261-1/+17
| | | | | | | | | | | | Now the selection dialog for events, handlers, and handler argument events selects the the current event/handler properly when opened. Task-number: QT3DS-135 Change-Id: I9a85772206a8fa065f0c1762358afa256dbff286 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix mouse helper lost in refactoringMiikka Heikkinen2017-10-261-0/+1
| | | | | | | | Automerging seems to have inexplicably lost mouse helper from actionview, bring it back. Change-Id: I9eeda1eb7305a92bd3d3f17ec88b25f206b52b07 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix object selection browser initializationMiikka Heikkinen2017-10-261-6/+16
| | | | | | | | | | | | Now the selection dialog for trigger and target objects and alias reference objects selects the the current object properly when opened and expand the tree to show the selected object. Task-number: QT3DS-135 Change-Id: If4f42105434ecaa5998c4640f7fbd46f9b5e5edf Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename the rest of the UIC to Qt3DSMäättä Antti2017-10-241-2/+2
| | | | | | Task-number: QT3DS-18 Change-Id: Ia8141980f575565ee7dbfa33422f25f121da5fe1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename CUICDM type names to Qt3DSDMMäättä Antti2017-10-241-9/+9
| | | | | | Task-number: QT3DS-18 Change-Id: Ia0ba2bb501f7d66b0088bd568bfad46a678ac078 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename CUICDMSlideHandle to Qt3DSDMSlideHandleMäättä Antti2017-10-241-8/+6
| | | | | | | Task-number: QT3DS-18 Change-Id: Idc37208a981ab8ab03cc1db31a45ab19e602a5aa Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UICDM and UICIMP to QT3DSMäättä Antti2017-10-241-4/+4
| | | | | | | Task-number: QT3DS-18 Change-Id: I3800cd72b449b033b0b42cf2dd9e9eccc4eb7f8f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename instance and property handles to Qt3DSMäättä Antti2017-10-241-14/+14
| | | | | | Task-number: QT3DS-18 Change-Id: Id93959e382dd9285590fdf979c71a459e7657e01 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace UICDM namespace with qt3dsdm namespaceMäättä Antti2017-10-241-34/+35
| | | | | | Task-number: QT3DS-18 Change-Id: I8a76c6be45eee7285a21cdf87ac28b88c4522102 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow drag-modifying float field valuesMiikka Heikkinen2017-10-201-0/+1
| | | | | | | | | | | | It is now possible to change float field values by dragging horizontally with mouse. Mouse wheel support for float fields was removed as redundant. Task-number: QT3DS-128 Change-Id: Ice3e61df78b8b0ca2757bd8333cb2987cfea62a9 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-061-0/+848
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 18:21:54 +0000