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

37
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -32,6 +32,7 @@
#include "metainfo.h"
#include "seekerslider.h"
#include "view3dactioncommand.h"
#include "nodehints.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagebox.h>
@@ -46,7 +47,6 @@
#include <utils/qtcassert.h>
#include <utils/utilsicons.h>
#include <QDebug>
#include <QToolButton>
namespace QmlDesigner {
@@ -222,19 +222,40 @@ void Edit3DView::onEntriesChanged()
void Edit3DView::handleEntriesChanged()
{
QMap<QString, QList<ItemLibraryEntry>> entriesMap {
{"Camera", {}},
{"Lights", {}},
{"Models", {}}
if (!model())
return;
const QString cameras = tr("Cameras");
const QString lights = tr("Lights");
const QString primitives = tr("Primitives");
const QString importedModels = tr("Imported Models");
const QStringList keys {cameras, lights, primitives, importedModels}; // used to maintain order
QHash<QString, QList<ItemLibraryEntry>> entriesMap {
{cameras, {}},
{lights, {}},
{primitives, {}},
{importedModels, {}}
};
const QList<ItemLibraryEntry> itemLibEntries = model()->metaInfo().itemLibraryInfo()->entries();
for (const ItemLibraryEntry &entry : itemLibEntries) {
if (entry.typeName().startsWith("QtQuick3D.") && entriesMap.contains(entry.category()))
entriesMap[entry.category()].append(entry);
if (entry.typeName() == "QtQuick3D.Model") {
entriesMap[primitives].append(entry);
} else if (entry.typeName() == "QtQuick3D.DirectionalLight"
|| entry.typeName() == "QtQuick3D.PointLight"
|| entry.typeName() == "QtQuick3D.SpotLight") {
entriesMap[lights].append(entry);
} else if (entry.typeName() == "QtQuick3D.OrthographicCamera"
|| entry.typeName() == "QtQuick3D.PerspectiveCamera") {
entriesMap[cameras].append(entry);
} else if (entry.typeName().startsWith("Quick3DAssets.")
&& NodeHints::fromItemLibraryEntry(entry).canBeDroppedInView3D()) {
entriesMap[importedModels].append(entry);
}
}
m_edit3DWidget->updateCreateSubMenu(entriesMap);
m_edit3DWidget->updateCreateSubMenu(keys, entriesMap);
}
void Edit3DView::modelAboutToBeDetached(Model *model)