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

QmlDesigner: Add link to add QtQuick3D from ContentLibrary

Browse Source 
Fixes: QDS-11766
Change-Id: I092cfc07fda96f73be20383f7601e50f89c7207f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Shrief Gabr
2025-01-29 16:44:48 +02:00
parent 10e3b0f9ff
commit 0a56c9d676
6 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryEffectsView.qml
View File

@@ -107,11 +107,14 @@ HelperWidgets.ScrollView {
Text {
id: infoText
text: {
if (!ContentLibraryBackend.rootView.isQt6Project)
qsTr("<b>Content Library</b> effects are not supported in Qt5 projects.")
else if (!ContentLibraryBackend.rootView.hasQuick3DImport)
qsTr("To use <b>Content Library</b>, first add the QtQuick3D module in the <b>Components</b> view.")
qsTr('To use <b>Content Library</b>, first <a href="#add_import" style="text-decoration:none;color:%1">
add the QtQuick3D module</a> in the <b>Components</b> view.')
.arg(StudioTheme.Values.themeInteraction)
else if (!ContentLibraryBackend.effectsModel.hasRequiredQuick3DImport)
qsTr("To use <b>Content Library</b>, version 6.4 or later of the QtQuick3D module is required.")
else if (!ContentLibraryBackend.rootView.hasMaterialLibrary)
@@ -123,11 +126,14 @@ HelperWidgets.ScrollView {
else
""
}
textFormat: Text.RichText
color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize
topPadding: 10
leftPadding: 10
visible: ContentLibraryBackend.effectsModel.isEmpty
onLinkActivated: ContentLibraryBackend.rootView.addQtQuick3D()
}
}
}

9
share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml
View File

@@ -112,11 +112,14 @@ HelperWidgets.ScrollView {
Text {
id: infoText
text: {
if (!ContentLibraryBackend.rootView.isQt6Project)
qsTr("<b>Content Library</b> materials are not supported in Qt5 projects.")
else if (!ContentLibraryBackend.rootView.hasQuick3DImport)
qsTr("To use <b>Content Library</b>, first add the QtQuick3D module in the <b>Components</b> view.")
qsTr('To use <b>Content Library</b>, first <a href="#add_import" style="text-decoration:none;color:%1">
add the QtQuick3D module</a> in the <b>Components</b> view.')
.arg(StudioTheme.Values.themeInteraction)
else if (!root.materialsModel.hasRequiredQuick3DImport)
qsTr("To use <b>Content Library</b>, version 6.3 or later of the QtQuick3D module is required.")
else if (!ContentLibraryBackend.rootView.hasMaterialLibrary)
@@ -128,13 +131,15 @@ HelperWidgets.ScrollView {
else
""
}
textFormat: Text.RichText
color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize
topPadding: 10
leftPadding: 10
visible: root.materialsModel.isEmpty
wrapMode: Text.WordWrap
width: root.width - x
onLinkActivated: ContentLibraryBackend.rootView.addQtQuick3D()
}
}
}

9
share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml
View File

@@ -206,11 +206,13 @@ Item {
text: {
let categoryName = (categoryTitle === "3D") ? categoryTitle + " assets"
: categoryTitle.toLowerCase()
if (!ContentLibraryBackend.rootView.isQt6Project)
qsTr("<b>Content Library</b> is not supported in Qt5 projects.")
else if (!ContentLibraryBackend.rootView.hasQuick3DImport && categoryTitle !== "Textures")
qsTr("To use " + categoryName + ", first add the QtQuick3D module in the <b>Components</b> view.")
qsTr(`To use %1, first <a href="#add_import" style="text-decoration:none;color:%2">
add the <b>QtQuick3D</b> module</a> in the <b>Components</b> view.`)
.arg(categoryName)
.arg(StudioTheme.Values.themeInteraction)
else if (!ContentLibraryBackend.rootView.hasMaterialLibrary && categoryTitle !== "Textures")
qsTr("<b>Content Library</b> is disabled inside a non-visual component.")
else if (categoryEmpty)
@@ -218,11 +220,14 @@ Item {
else
""
}
textFormat: Text.RichText
color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize
topPadding: 10
leftPadding: 10
visible: infoText.text !== ""
onLinkActivated: ContentLibraryBackend.rootView.addQtQuick3D()
}
}
}

9
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
View File

@@ -74,6 +74,15 @@ WidgetInfo ContentLibraryView::widgetInfo()
m_bundleHelper = std::make_unique<BundleHelper>(this, m_widget);
connect(m_widget, &ContentLibraryWidget::importQtQuick3D, this, [&] {
DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument();
if (document && !document->inFileComponentModelActive() && model()) {
ModelUtils::addImportWithCheck(
"QtQuick3D",
[](const Import &import) { return !import.hasVersion() || import.majorVersion() >= 6; },
model());
}
});
connect(m_widget, &ContentLibraryWidget::bundleMaterialDragStarted, this,
[&] (QmlDesigner::ContentLibraryMaterial *mat) {
m_draggedBundleMaterial = mat;

5
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
View File

@@ -679,6 +679,11 @@ bool ContentLibraryWidget::areNodes3D(const QByteArray &data) const
return true;
}
void ContentLibraryWidget::addQtQuick3D()
{
emit importQtQuick3D();
}
QSize ContentLibraryWidget::sizeHint() const
{
return {420, 420};

2
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h
View File

@@ -102,6 +102,7 @@ public:
Q_INVOKABLE void updateSceneEnvState();
Q_INVOKABLE void markTextureUpdated(const QString &textureKey);
Q_INVOKABLE bool areNodes3D(const QByteArray &data) const;
Q_INVOKABLE void addQtQuick3D();
QSize sizeHint() const override;
@@ -128,6 +129,7 @@ signals:
void acceptTexturesDrop(const QList<QUrl> &urls);
void acceptMaterialDrop(const QString &internalId);
void accept3DDrop(const QByteArray &internalIds);
void importQtQuick3D();
protected:
bool eventFilter(QObject *obj, QEvent *event) override;