Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 5e2792ff rédigé par Kubat's avatar Kubat
Parcourir les fichiers

LIB: Use the JsonBuilder to create "ordered QJsonDocuments", to be ordered in the property viewer

parent ae356980
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!18Implement the VivyDocument specification
#include "../CRTPSubDocument.hh"
#include "../../JsonBuilder.hh"
using namespace Vivy;
......@@ -32,17 +33,13 @@ AssSubDocument::getStyles() const noexcept
QJsonDocument
AssSubDocument::getProperties() const noexcept
{
QJsonDocument ret;
QJsonObject styleObject;
for (const Ass::StylePtr &style : styles) {
styleObject.insert(style->getElementName(), style->getProperties().object());
}
QJsonObject object{
{ "Styles", styleObject },
return JsonBuilder::createOrderedJsonDocument({
{ "File", filePath },
};
ret.setObject(object);
return ret;
{ "Styles", styleObject },
});
}
#include "../CRTPSubDocument.hh"
#include "../../JsonBuilder.hh"
using namespace Vivy;
......@@ -22,11 +23,8 @@ AudioSubDocument::getElementName() const noexcept
QJsonDocument
AudioSubDocument::getProperties() const noexcept
{
QJsonDocument ret;
QJsonObject object{
{ "Audio context", contextPtr->getProperties().object() },
return JsonBuilder::createOrderedJsonDocument({
{ "File", filePath },
};
ret.setObject(object);
return ret;
{ "Audio context", contextPtr->getProperties().object() },
});
}
#include "../CRTPSubDocument.hh"
#include "../../JsonBuilder.hh"
using namespace Vivy;
......@@ -22,11 +23,8 @@ VideoSubDocument::getElementName() const noexcept
QJsonDocument
VideoSubDocument::getProperties() const noexcept
{
QJsonDocument ret;
QJsonObject object{
return JsonBuilder::createOrderedJsonDocument({
{ "Video context", contextPtr->getProperties().object() },
{ "File", filePath },
};
ret.setObject(object);
return ret;
});
}
#include "VivyDocument.hh"
#include "../Utils.hh"
#include "../JsonBuilder.hh"
using namespace Vivy;
......@@ -400,21 +401,13 @@ VivyDocument::getElementName() const noexcept
QJsonDocument
VivyDocument::getProperties() const noexcept
{
QJsonDocument ret;
QJsonObject object;
QJsonObject subDocObject;
subDocObject.insert("Audio sub-document",
audioDocument ? audioDocument->getProperties().object() : QJsonValue());
subDocObject.insert("Video sub-document",
videoDocument ? videoDocument->getProperties().object() : QJsonValue());
subDocObject.insert("ASS sub-document",
assDocument ? assDocument->getProperties().object() : QJsonValue());
object.insert("Uuid", getUuid().toString());
object.insert("Name", getName());
object.insert("Sub documents", subDocObject);
ret.setObject(object);
return ret;
return JsonBuilder::createOrderedJsonDocument(
{ { QStringLiteral("Uuid"), getUuid().toString() },
{ QStringLiteral("Name"), getName() },
{ QStringLiteral("Sub documents"),
JsonBuilder::createOrderedJsonObject({
JsonBuilder::getSubDocumentJson("Audio sub document", audioDocument),
JsonBuilder::getSubDocumentJson("Video sub document", videoDocument),
JsonBuilder::getSubDocumentJson("ASS sub document", assDocument),
}) } });
}
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter