summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/UI
Commit message (Collapse)AuthorAgeFilesLines
* Fix OpenGL runtime picking with scaled cameraKaj Grönholm2019-05-071-0/+4
| | | | | | | | | | | | When camera scale property has been modified, picking scale needs to be inverted or it scales into wrong direction. This affects both runtime viewer and editor in scene camera view. Task-number: QT3DS-3393 Change-Id: Ib643af22861b81fb0fc9e78ebfd2d724e765eff5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix setting default startup viewMahmoud Badri2019-04-093-9/+8
| | | | | | | | It was not possible to set the scene camera as the start up view. This patch fixes that. Change-Id: I4a64c747c148481627403f980273b4f6fa879607 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Revert "Remove legacy viewer"Miikka Heikkinen2019-03-262-12/+28
| | | | | | | | | | | | | | 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-223-196/+58
| | | | | | | | - Removed useless code - Some cleanups Change-Id: I92433ae375026d8f0acbf7d8a4731f65a6ef3ebd 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 tab order in some dialogsMiikka Heikkinen2019-03-191-0/+6
| | | | | | | | | 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>
* Fix missing initial color from Color DialogTomi Korpipaa2019-01-231-1/+0
| | | | | | | Task-number: QT3DS-2923 Change-Id: Ia5eb0518fd69745697df1778c9504c250fb87931 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use original presentation id when importing a presentationMiikka Heikkinen2018-12-191-1/+2
| | | | | | | | | | | | | If an original presentation id can be resolved for an imported presentation, that will be used as the id instead of generating a new one. In case the id is a duplicate with an existing id, then a new one will be generated based on the file name. Task-number: QT3DS-2486 Change-Id: I1bf75fedfa9230a4f73271522800eaab02942ab4 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 maintaining presentation aspect ratioKaj Grönholm2018-11-271-2/+2
| | | | | | Task-number: QT3DS-2744 Change-Id: Ic9f36decb43c36760dfe17e890362f41dd8e288d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Populate recent items menu even when startupdialog is rejectedTomi Korpipää2018-11-051-2/+5
| | | | | | | Task-number: QT3DS-2587 Change-Id: I51e3b775ee4f877337a35136b891f019078cbb80 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement scene camera tabMiikka Heikkinen2018-11-022-0/+4
| | | | | | | | | 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 tab ordering in presentation settingsTomi Korpipaa2018-11-011-0/+1
| | | | | | | | Task-number: QT3DS-2602 Change-Id: I7a964f2063700076007a24e4bfab733127bc3185 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add use ktx checkbox to presentation settingsTomi Korpipää2018-10-245-122/+74
| | | | | | | | | | | Also did some cleanup for studio project settings and studio preferences. Runtime modifications for this task are done in another commit. Task-number: QT3DS-2505 Change-Id: Iffc075b74a25f53a06699ae1c61c458211066cd2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix dialog resizing issues when moving between different screensMiikka Heikkinen2018-10-192-0/+7
| | | | | | | | | | | | | | | | Moving dialogs between screens with different pixel ratios caused some dialogs to resize incorrectly. Fixed the sizes of dialogs and adjusted their layout so it keeps consistent. Also fixed some accept/reject handling, as it could be bypassed by triggering accept/reject by some other means besides the dialog buttons. Now the relevant handling is always called regardless of the way a dialog is closed. Task-number: QT3DS-2514 Change-Id: Ic53b395866db3ef9720cdd5474d7937869681519 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change many CStrings to QStringMahmoud Badri2018-10-104-96/+48
| | | | | | | | | | | | | | - 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>
* Show presentation ID in project paletteMiikka Heikkinen2018-10-031-1/+5
| | | | | | | | | | | | | | If presentation is not part of the project, a warning icon is shown instead of ID. Editing the ID of such presentation adds it to the project. Also made initial expanding of presentations folder work more reliably. Task-number: QT3DS-2231 Change-Id: I2dd4fbc3b3dbb3b18feb9fab88621e23d175c856 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix startup dialog background on high-DPITomi Korpipaa2018-09-282-223/+197
| | | | | | Task-number: QT3DS-2391 Change-Id: Id2b275c1da0a24751131b0e12ece0834c7994847 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove legacy viewerTomi Korpipaa2018-09-102-28/+12
| | | | | | Task-number: QT3DS-2291 Change-Id: I0a11dfc1d69e4844e67476b60bc40da99c6ad12a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix miscellaneous settings issuesMiikka Heikkinen2018-08-303-73/+7
| | | | | | | | | | | | | - 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>
* Add presentation id to the presentation settings panelMahmoud Badri2018-07-264-151/+91
| | | | | | | | | | | | | | | | | | | | | | - 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>
* Fix edit menu itemsMiikka Heikkinen2018-06-271-0/+2
| | | | | | | | | | | | | | | | - 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>
* Merge branch '2.0'Miikka Heikkinen2018-06-124-230/+389
|\ | | | | | | Change-Id: I3ac5b134bbf870c17e5f01934cfb76a138786686
| * 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 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>
* | Consolidate stdafx headers into Qt3DSCommonPrecompile.hMiikka Heikkinen2018-06-1210-54/+15
|/ | | | | | | | | Task-number: QT3DS-256 Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Restart Studio if settings that require a restart are madeTomi Korpipaa2018-05-226-41/+31
| | | | | | | | | | 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 tooltips and shortcut displayMiikka Heikkinen2018-05-151-0/+7
| | | | | | | | | | | - 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>
* Make runtime2 viewer as default viewerMarianne Yrjänä2018-05-142-0/+16
| | | | | | | | | | | 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>
* Re-organize folder structure to remove obsolete _Win folderTomi Korpipaa2018-05-0933-0/+5269
| | | | | | | Task-number: QT3DS-1594 Change-Id: I2f4b1b5b7b38e56c38f7ed9bb7f2081924db660b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove unused code from ViewsTomi Korpipaa2017-11-092-229/+0
| | | | | Change-Id: I40862e7a146225ba94a284bcd1a69a3363d1c853 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* MFC cleanupChristoph Schleifenbaum2017-10-103-260/+0
| | | | | | Change-Id: If9a9f07ba9505712f3007a96c09a8cac42e8b0b7 Task-Id: BOUL-753 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-065-0/+489
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 02:24:21 +0000