summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-101-261/+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>
* Clean up StudioUtilsMiikka Heikkinen2018-10-181-1/+1
| | | | | | | | | | | 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>
* Do not query sibling timerange when creating new object by DnDJanne Kangas2018-09-131-1/+2
| | | | | | | | | | | | | | During object creation, to-be-siblings are queried for start/end times so that the new object start/end can be set to same values. For certain types of siblings (Component), these properties do not exist at this point of time. Fix moves time range setting to a later time when it can be queried from parent. Change-Id: If93465ba24784654533b0d0f126cc134ee41b988 Task-id: QT3DS-2320 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@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-2/+3
| | | | | | | | | | | | | | | | | | | | | | - 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-9/+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>
* Remove old DataInput proto codeJanne Kangas2018-02-231-3/+0
| | | | | | | | | | | | | | | | Reverts some (not all) changes in commits: 935d8a983db25978b3e8f0dbe67323684ce4dd96 e3c6e9d38a5b6f729093fc0349784fa475af8f62 337aaa465ac78ac72ca748f0c2d4c3b6257829b8 0707c13c34653066c89d5b25abe60a779650ee27 c1fc5d13e3668a117b4f8470ecb87b77b145efb8 Task-ID: QT3DS-865 Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Datainput part 1Janne Kangas2017-12-181-0/+3
| | | | | | | | | | | | Implements Datainput as graph object that can be parsed from UIP files and fed data from QML. Adding Datainput object from studio UI is disabled intentionally as functionality will be fleshed out in the following patches. Task-ID: QT3DS-2 Change-Id: I449087aa968ae2331f203c4cb6e41b8ac6eef5cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* CFilePath is refactored to inherit from QFileInfoTomi Korpipaa2017-11-061-2/+2
| | | | | | | | | | | | | | 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 CUICDMSlideHandle to Qt3DSDMSlideHandleMäättä Antti2017-10-241-2/+2
| | | | | | | 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-2/+2
| | | | | | | 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-2/+2
| | | | | | Task-number: QT3DS-18 Change-Id: Id93959e382dd9285590fdf979c71a459e7657e01 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UIC files to Qt3DS filesMäättä Antti2017-10-241-1/+1
| | | | | | Task-number: QT3DS-18 Change-Id: Id29fa8761de5694bcca394df7be8448a23d901b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace UICDM namespace with qt3dsdm namespaceMäättä Antti2017-10-241-5/+5
| | | | | | Task-number: QT3DS-18 Change-Id: I8a76c6be45eee7285a21cdf87ac28b88c4522102 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-061-0/+266