feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Allow adding imported 3D models using the context menu

Browse Source 
Also some changes to support translation and avoid translation-related
issues.

Change-Id: Ie2cc491cf491ac4c14e12e8cf666d4b452b9e7c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Mahmoud Badri
2022-08-26 17:45:11 +03:00
parent 184614c3d8
commit 4e5673850c
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -193,8 +193,9 @@ void Edit3DWidget::createContextMenu()
});
}
// Called by the view to update the "create" sub-menu when the Quick3D entries are ready
void Edit3DWidget::updateCreateSubMenu(const QMap<QString, QList<ItemLibraryEntry>> &entriesMap)
// Called by the view to update the "create" sub-menu when the Quick3D entries are ready.
void Edit3DWidget::updateCreateSubMenu(const QStringList &keys,
const QHash<QString, QList<ItemLibraryEntry>> &entriesMap)
{
if (!m_contextMenu)
return;
@@ -207,14 +208,17 @@ void Edit3DWidget::updateCreateSubMenu(const QMap<QString, QList<ItemLibraryEntr
m_nameToEntry.clear();
m_createSubMenu = m_contextMenu->addMenu(tr("Create"));
const QStringList categories = entriesMap.keys();
for (const QString &cat : categories) {
for (const QString &cat : keys) {
QList<ItemLibraryEntry> entries = entriesMap.value(cat);
if (entries.isEmpty())
continue;
QMenu *catMenu = m_createSubMenu->addMenu(cat);
QList<ItemLibraryEntry> entries = entriesMap.value(cat);
std::sort(entries.begin(), entries.end(), [](const ItemLibraryEntry &a, const ItemLibraryEntry &b) {
return a.name() < b.name();
});
for (const ItemLibraryEntry &entry : std::as_const(entries)) {
QAction *action = catMenu->addAction(entry.name(), this, &Edit3DWidget::onCreateAction);
action->setData(entry.name());