summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-101-630/+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 CString to QString conversionsMahmoud Badri2019-05-231-1/+1
| | | | | | | | | plus some tweaks. Change-Id: I714c9fea4afcfd3f15380c2e74c11fba515ae107 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>
* Fix crash/freeze when changing projectTomi Korpipaa2019-01-231-0/+18
| | | | | | | | | | | | If the new project is in a totally different directory tree, we may end up with crashes when trying to parse something that should not be parsed. Recreating the FileSystemModel removes unwanted items from the model. Task-number: QT3DS-2936 Change-Id: I280afe8afb4f9faa7b68f613de06520ad493ccff Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't close various chooser dialogs immediately on selectionMiikka Heikkinen2018-11-141-12/+18
| | | | | | | | | | | | | Now the chooser dialogs stick around until you doubleclick on item or they lose focus naturally. Also fixes some related issues like fixed choices never highlighting as selected. Task-number: QT3DS-2655 Change-Id: I33b42383a303f9ba2ae10e1b7e3131e4bfd0c62f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up StudioUtilsMiikka Heikkinen2018-10-181-5/+7
| | | | | | | | | | | 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>
* Drag and drop images to the timelineMahmoud Badri2018-10-151-1/+1
| | | | | | | | | | - You can now drag images from the project palette to the timeline rows. Supported drop rows are layers, materials and images. - Relevant tweaks. Task-number: QT3DS-2267 Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Display sub-presentations in inspector image choosersMiikka Heikkinen2018-08-201-3/+14
| | | | | | | | | | | | | | Subpresentations can now be selected as images from image chooser. Selecting a subpresentation will show it also as the image property value of the material. Manually setting subpresentation from image properties is disabled, though the value is still shown. Task-number: QT3DS-2090 Change-Id: Ie02898c0e111c16b2b27368b03901d2adc20fa91 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve the project fileMahmoud Badri2018-08-141-1/+1
| | | | | | | | | | | Changed the project name and path types to QString instead of the notorious CString and CFilePath. Removed 2 member variables and a method. Also improved the conversion from absolute to relative paths. Task-number: QT3DS-2001 Change-Id: I79619ca2aebd21e5e29abc219a62831ee2117be4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add presentation id to the presentation settings panelMahmoud Badri2018-07-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | - 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>
* Consolidate stdafx headers into Qt3DSCommonPrecompile.hMiikka Heikkinen2018-06-121-2/+2
| | | | | | | | | 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>
* Use correct icons in mesh selector1.1Kaj Grönholm2018-03-021-1/+4
| | | | | | | | | Allows setting custom icon for choosers. Task-number: QT3DS-195 Change-Id: Iec1d7fd3cf6ebcfaabba222609ec90d86069c9ab Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* CFilePath is refactored to inherit from QFileInfoTomi Korpipaa2017-11-061-1/+1
| | | | | | | | | | | | | | The CFilePath class in NDD was the primary means of abstracting file path handling and manipulation in the authoring tool. The implementation is heavily windows idiosyncratic. This change completely refactors the class to rely upon Qt's file path handling abstractions: QFileInfo and QDir. The goal is to continue to shrink this class until it can be removed entirely and all call sites can use QFileInfo and friends directly. Task-number: QT3DS-221 Change-Id: I0e31c96982a3f3a9411346f6c1dd82a6d1fa00ca Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UICDM and UICIMP to QT3DSMäättä Antti2017-10-241-1/+1
| | | | | | | Task-number: QT3DS-18 Change-Id: I3800cd72b449b033b0b42cf2dd9e9eccc4eb7f8f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-061-0/+592
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 09:57:40 +0000