summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Slide
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Improve several parts of the variant tags featureMahmoud Badri2019-03-144-28/+34
| | | | | | | | | | | | | | - 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>
* Update variants slide view UIMahmoud Badri2019-03-142-10/+11
| | | | | | | | | 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>
* Implement variant tags slide view tooltipv2.3.0-beta2Mahmoud Badri2019-03-045-39/+135
| | | | | | | | Task-number: QT3DS-3114 Change-Id: I9003913ab919ad53ae0ec1e4192f41772fb4141f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Implement variants UI on the slide viewMahmoud Badri2019-02-215-45/+127
| | | | | | Task-number: QT3DS-3087 Change-Id: Ie402e48d2a948bde32388d0ea4c4245a87e94e21 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Track selection properly on chooser dialogsMiikka Heikkinen2018-12-131-0/+2
| | | | | | | | | | | | | 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>
* Fix context menu position in slide viewMiikka Heikkinen2018-12-041-7/+11
| | | | | | | | | | | Mouse position mapping was done against incorrect object in case of clicking on master slide. Task-number: QT3DS-2820 Change-Id: Ic962eef50d18b8a97372a0de5ea6f62ee929abfe Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix slide DnD with more slidesKaj Grönholm2018-11-121-0/+1
| | | | | | Task-number: QT3DS-2638 Change-Id: Iae88996bbf14b4b8682820de8717716f71eaedde Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* UX changes to datainput management and selectorJanne Kangas2018-11-011-4/+3
| | | | | | | | | - New layout for management dialog - Filters and search for datainput select/replace list Change-Id: Idbfa26f1bb59a2d6185a9ad803b4be623db9b30d Task-id: QT3DS-2513 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix datainput chooser popup alignmentMiikka Heikkinen2018-10-191-1/+2
| | | | | | | | | | | | | | | Introduced new options for CDialogs::showWidgetBrowser alignment: Combobox, ToolButton, or Center. Combobox is the default and positions the popup as it has before, which is suitable for comboboxes. ToolButton alignment positions the corner of the popup over the toolbutton and prefers to open the popup above rather than below. Center alignment simply centers the popup on given point. Task-number: QT3DS-2504 Change-Id: Ibca6895010baec19508259eb6b3976b6082740e9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow String and Variant datainput types as slide controllers everywhereJanne Kangas2018-10-181-1/+1
| | | | | | | | | Fix allows setting Variant datainput as slide controller also in SlideView, in order to match datainput management dialog behavior. Change-Id: I6aacfdf08e8f068b871bccc5b3415cc0876ae92d Task-id: QT3DS-2511 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up StudioUtilsMiikka Heikkinen2018-10-181-4/+4
| | | | | | | | | | | 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>
* Make space between datainput icon and controller name equal everywhereMiikka Heikkinen2018-09-071-1/+1
| | | | | | | Task-number: QT3DS-2270 Change-Id: Ia32fe39341d62302199f77794a23cb2f9540bae5 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add hover indicator to property animation and datainput buttonsMiikka Heikkinen2018-09-061-1/+1
| | | | | | | Task-number: QT3DS-2268 Change-Id: I0827bb97c6b11cd4e2fc52a7296fbe7447857b2b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update data input iconsMiikka Heikkinen2018-09-061-2/+2
| | | | | | | Task-number: QT3DS-2269 Change-Id: Ic9776d9d0ad24fc97e5d5e160eda21c4e9a8f494 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve datainput tooltipsKaj Grönholm2018-08-271-2/+3
| | | | | | | | | Have tooltips also when datainput is not set and unify the strings in these cases. Task-number: QT3DS-1968 Change-Id: Id17db845e9cf3f637bb36633b1d825cf3b5166b8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make datainput selector popup placement fixedJanne Kangas2018-08-151-1/+1
| | | | | | | | | | Change positioning in both slide and inspector panels Change-Id: Ibb197cd12ad9a5b08b632539101731dc85702878 Task-Id: QT3DS-2059 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve slide data input control visualizationJanne Kangas2018-07-253-0/+62
| | | | | | | | | Adds indicator to slide panel that shows the controlling data input name. Change-Id: I148facafc4d02e764d44a543c2152796d008522d Task-id: QT3DS-1668 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix edit menu itemsMiikka Heikkinen2018-06-272-12/+4
| | | | | | | | | | | | | | | | - 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>
* Optimize data input indicator handlingMiikka Heikkinen2018-06-152-22/+26
| | | | | | | | | | | | | | | The data input indicators were getting updated redundantly. Changed it so that only EndDataModelNotifications event triggers update for data input indicator in timeline toolbar and slide view. Rest of the event triggers for the update were redundant as they were always accompanied by this event. Also now we only update the indicators if the data input actually changes, saving us from continuously updating the style sheet. Task-number: QT3DS-1902 Change-Id: I619eeccc43e417fc17c35d5d38b01f8a2fe4fffa Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix datainput type issuesv2.0.0-rc2v2.0.0Miikka Heikkinen2018-06-121-1/+2
| | | | | | | | | | | | | | | - 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>
* 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>
* 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>
* Bind new datainput directly when added from "Add new datainput"Janne Kangas2018-05-301-1/+1
| | | | | | | | | | 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>
* Check missing datainput definitions when opening a presentationJanne Kangas2018-05-231-4/+4
| | | | | | | | | | | | Iterates through the presentation and checks if datainput control bindings are using a valid datainput. If datainput definitions are missing, shows a dialog that allows the user to automatically remove invalid bindings. Task-ID: QT3DS-1658 Change-Id: I11db40813c8a7368b05f0a8b377472a9e0b1db12 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shortcut duplicate for slidesTomi Korpipaa2018-05-152-1/+16
| | | | | | Task-number: QT3DS-1642 Change-Id: Id9889608588b32d0983bcfabdc202d7fb5fcb276 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix QSS issue with palette title highlightingJanne Kangas2018-05-151-2/+2
| | | | | | | | | Task-ID: QT3DS-1665 Change-Id: I061d9cd25fe83ba687a1df5654eb44cc6a1aaa1d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix tooltips and shortcut displayMiikka Heikkinen2018-05-151-2/+2
| | | | | | | | | | | - 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-072-28/+2
| | | | | | | | | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/master' into wip/timelineMiikka Heikkinen2018-04-231-2/+3
|\ | | | | | | Change-Id: I58176ea495831aee6eb35b9057bdecb6f3a6e1fe
| * UX changes to DatainputJanne Kangas2018-04-201-2/+3
| | | | | | | | | | | | | | | | | | | | Layout changes in Inspector Panel and Datainput management dialog. Open directly dialog for adding datainput when option "[Add new..." is selected from datainput selector. Show datainput type in datainput selector. Change-Id: I2e82cb2c10720d96b34a7e500f71dc86162a3003 Task-Id: QT3DS-1422 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge branch 'master' into wip/timelineMiikka Heikkinen2018-04-096-65/+154
|\| | | | | | | | | | | | | This merge loses datainput functionality in timeline toolbar. It needs to be readded in a separate commit. Change-Id: I92ca36e87718e9451b589465eb7ebbd801932820
| * Add '$' prefix to datainput names in UIP fileJanne Kangas2018-04-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Differentiate between controller datainput and property with similar name by using a special character prefix for the controller. Disallow using special characters in datainput addition dialog. Update example to follow convention. Task-ID: QT3DS-1360 Change-Id: I40b8b5f36b24b96b14798eddb594f897ed9ef624 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Add shortcuts to Slides context menuTomi Korpipaa2018-03-261-2/+6
| | | | | | | | | | | | | | | | Task-number: QT3DS-1370 Change-Id: Ic0f45639d8fa29ec5658abbcff0d06118af8223b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix tooltips view menu itemTomi Korpipaa2018-03-233-22/+28
| | | | | | | | | | | | | | | | 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>
| * Change Datainput selector to match other object selectorsJanne Kangas2018-03-072-15/+37
| | | | | | | | | | | | | | | | | | | | | | Fixes selection window stealing focus. UX changes. Code repartitioning in InspectorControlView/Model. Change-Id: I28bcaec1825c4e375955eeffe191a89de7b6cfe2 Task-id: QT3DS-1249 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Slide view highlight to follow active slide #2Kaj Grönholm2018-03-022-7/+6
| | | | | | | | | | | | | | | | | | | | When fixing QT3DS-1195 didn't know this affects also undo. So highlight to follow all the time, not just during playback. Task-number: QT3DS-684 Change-Id: I186b07cac20332dc38ccb362b800e8a3f5a4a683 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Slide view highlight to follow active slidev1.1.0-rc3v1.1.0Kaj Grönholm2018-02-263-1/+21
| | | | | | | | | | | | | | | | During playback highlight to follow presentation active slide. Task-number: QT3DS-1195 Change-Id: I874227e4f91c32044b21edb7aee2227c2b494028 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Visualize datainput control status betterJanne Kangas2018-02-193-0/+22
| | | | | | | | | | | | | | | | | | | | Add label that shows the current controller and change dock title color when slide transitions or timeline is controlled. Task-ID: QT3DS-1051 Change-Id: I2faefb076fffab673640ce2d32b7c3ec0e31cdd7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix crash when changing datainput for text elementMiikka Heikkinen2018-02-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Data input connection always used the handle and instance values that were used when the connection was established. Also changed it so that callback from selection dialog only comes when user changes the selection instead of getting one during dialog setup. Task-number: QT3DS-1056 Change-Id: Ic4d6bf78ebba5859f55c69f946bc10d7b8154a06 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix broken undo/redo stackMiikka Heikkinen2018-02-161-12/+8
| | | | | | | | | | | | | | | | | | | | | | Datainput controls for timeline and slides used transactions for querying values, which broke the undo stack. There is no need to use transaction for querying a value. Task-number: QT3DS-1074 Change-Id: I57a426c126b4638e858ef3256b64bd8494248e4a Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Allow component to have datainput controlling slide transitionsJanne Kangas2018-02-141-7/+24
| | | | | | | | | | | | | | | | | | Task-ID: QT3DS-1053 Change-Id: I4b729feeeb738ae1117c4d81c8554ccb9df95f02 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge branch 'master' into wip/timelineMiikka Heikkinen2018-02-273-6/+230
|\| | | | | | | Change-Id: If6e06be72a24372eef95339f55ffda24888eebc3
| * Fix data input chooser hover and selection for macOSTomi Korpipaa2018-02-081-2/+0
| | | | | | | | | | | | Task-number: QT3DS-976 Change-Id: I439a8789fe0421772ae395ee58d14ad8b771e937 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Make data input choosers act uniformlyTomi Korpipaa2018-02-063-6/+7
| | | | | | | | | | | | | | | | | | | | Inspector palette had a different look to its data input chooser than the other two. Also updated the look of the dialog, and now it is shown next to the data input icon, instead of in the middle of the screen. Task-number: QT3DS-950 Change-Id: I48e16c3b26066e06dba16c106e93f986e1523558 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Make data input tooltips multi-lineTomi Korpipaa2018-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | Especially slide palette needs this, as it is too narrow to show data input name on one line without it being cut. Task-number: QT3DS-949 Change-Id: I71efbffe4d2615e5d53d8760735b97d27646598f Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix Slide and Project panel layout on resizeJanne Kangas2018-02-021-4/+6
| | | | | | | | | | Change-Id: Iaa43aa57c058bdebe4d2b46139fa876966cb142a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * [DataInput] Add DataInput slide control buttonJanne Kangas2018-02-023-5/+228
| | | | | | | | | | | | | | | | Allows binding a DataInput as slide change controller. Also fix timeline control so that scene can have both slide and timeline controllers. Change-Id: I309c4229d5737d71b872c1e999240c9654dc6000 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:38:28 +0000