diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-10-25 17:21:49 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-10-26 07:16:52 +0000 |
commit | a78970d49de10062f1b5305e3ec7f7c01a4f5f44 (patch) | |
tree | 58399fcc8e15516568c66a13b1be401a9abe3217 /src/Authoring/Studio/Palettes/Project | |
parent | ba089929b44243a0b3cc8b6fff76933dd88d9f8e (diff) |
Fix DnD images to the timeline
- Correct dragged image path setting.
- Correct title of the choose image dialog upon dropping on a material
row.
- Correct the property that is set, upon dropping on a material row.
- Allow dropping images on a ref material
Task-number: QT3DS-2267
Task-number: QT3DS-2548
Change-Id: Ie05364c1b8f24fdb7ba85142a1eb5b2f89f16667
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Project')
-rw-r--r-- | src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp | 6 | ||||
-rw-r--r-- | src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp index f651fdc3..de515ad7 100644 --- a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp +++ b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp @@ -64,6 +64,12 @@ ChooseImagePropertyDlg::~ChooseImagePropertyDlg() delete m_ui; } +void ChooseImagePropertyDlg::setTextureTitle() +{ + setWindowTitle(tr("Set texture")); + m_ui->label->setText(tr("Set texture to:")); +} + bool ChooseImagePropertyDlg::detachMaterial() const { return m_ui->cbDetach->checkState() == Qt::Checked; diff --git a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.h b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.h index e644643c..3b6153ea 100644 --- a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.h +++ b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.h @@ -54,6 +54,7 @@ public: int getSelectedPropertyHandle() const; bool detachMaterial() const; + void setTextureTitle(); // make title/label show 'texture' instead of 'sub-presentation' private: Ui::ChooseImagePropertyDlg *m_ui; |