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

QmlDesigner: Implement exporting a material

Browse Source 
ContentLibraryView::exportLib3DItem() updated to work with materials.

Fixes: QDS-12905
Change-Id: If09b361851db366ef4ce4f1597d272fe5006e599
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2024-06-05 19:22:55 +03:00
parent 3ed7cac33f
commit 623cf628d6
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml
View File

@@ -135,12 +135,10 @@ StudioControls.Menu {
onTriggered: MaterialBrowserBackend.rootView.addMaterialToContentLibrary()
}
// TODO: implement
// StudioControls.MenuItem {
// text: qsTr("Export material")
// enabled: !materialBrowserModel.selectedMaterialIsComponent // TODO: support component materials
// visible: false
StudioControls.MenuItem {
text: qsTr("Export Material")
enabled: !materialBrowserModel.selectedMaterialIsComponent // TODO: support component materials
// onTriggered: MaterialBrowserBackend.rootView.exportMaterial()
// }
onTriggered: MaterialBrowserBackend.rootView.exportMaterial()
}
}

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

@@ -381,7 +381,7 @@ void ContentLibraryView::customNotification(const AbstractView *view,
} else if (identifier == "export_item_as_bundle") {
exportLib3DItem(nodeList.first());
} else if (identifier == "export_material_as_bundle") {
// TODO
exportLib3DItem(nodeList.first(), data.first().value<QPixmap>());
}
}
@@ -810,7 +810,7 @@ void ContentLibraryView::addLib3DItem(const ModelNode &node)
m_widget->userModel()->add3DItem(name, qml, m_iconSavePath.toUrl(), depAssetsList);
}
void ContentLibraryView::exportLib3DItem(const ModelNode &node)
void ContentLibraryView::exportLib3DItem(const ModelNode &node, const QPixmap &iconPixmap)
{
// prompt and get the exported bundle path
QString defaultExportFileName = QLatin1String("%1.%2").arg(node.id(), Constants::BUNDLE_SUFFIX);
@@ -820,13 +820,15 @@ void ContentLibraryView::exportLib3DItem(const ModelNode &node)
.currentDesignDocument()->fileName().parentDir();
}
QString exportPath = QFileDialog::getSaveFileName(m_widget, tr("Export Component"),
QString dialogTitle = node.metaInfo().isQtQuick3DMaterial() ? tr("Export Material")
: tr("Export Component");
QString exportPath = QFileDialog::getSaveFileName(m_widget, dialogTitle,
projectFP.pathAppended(defaultExportFileName).toFSPathString(),
tr("Qt Design Studio Bundle Files (*.%1)").arg(Constants::BUNDLE_SUFFIX));
if (exportPath.isEmpty())
return;
// targetPath is a temp path for collectiong and zipping assets, actual export target is where
// targetPath is a temp path for collecting and zipping assets, actual export target is where
// the user chose to export (i.e. exportPath)
QTemporaryDir tempDir;
QTC_ASSERT(tempDir.isValid(), return);
@@ -849,18 +851,7 @@ void ContentLibraryView::exportLib3DItem(const ModelNode &node)
QTC_ASSERT_EXPECTED(result, return);
m_zipWriter->addFile(qmlFilePath.fileName(), qmlString.toUtf8());
// generate and save icon
QString iconPath = QLatin1String("icons/%1").arg(icon);
m_iconSavePath = targetPath.pathAppended(iconPath);
getImageFromCache(qmlFilePath.toFSPathString(), [&](const QImage &image) {
QByteArray iconByteArray;
QBuffer buffer(&iconByteArray);
buffer.open(QIODevice::WriteOnly);
image.save(&buffer, "PNG");
m_zipWriter->addFile("icons/" + m_iconSavePath.fileName(), iconByteArray);
m_zipWriter->close();
});
// add the item to the bundle json
QJsonObject jsonObj;
@@ -882,6 +873,23 @@ void ContentLibraryView::exportLib3DItem(const ModelNode &node)
Utils::FilePath assetPathSource = DocumentManager::currentResourcePath().pathAppended(assetPath);
m_zipWriter->addFile(assetPath, assetPathSource.fileContents().value_or(""));
}
// add icon
auto addIconAndCloseZip = [&] (const auto &image) { // auto: QImage or QPixmap
QByteArray iconByteArray;
QBuffer buffer(&iconByteArray);
buffer.open(QIODevice::WriteOnly);
image.save(&buffer, "PNG");
m_zipWriter->addFile("icons/" + m_iconSavePath.fileName(), iconByteArray);
m_zipWriter->close();
};
m_iconSavePath = targetPath.pathAppended(iconPath);
if (iconPixmap.isNull())
getImageFromCache(qmlFilePath.toFSPathString(), addIconAndCloseZip);
else
addIconAndCloseZip(iconPixmap);
}
/**

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

@@ -63,7 +63,7 @@ private:
void addLibAssets(const QStringList &paths);
void addLib3DComponent(const ModelNode &node);
void addLib3DItem(const ModelNode &node);
void exportLib3DItem(const ModelNode &node);
void exportLib3DItem(const ModelNode &node, const QPixmap &iconPixmap = {});
void getImageFromCache(const QString &qmlPath,
std::function<void(const QImage &image)> successCallback);
QPair<QString, QSet<QString>> modelNodeToQmlString(const ModelNode &node, int depth = 0);