X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitledocument.cpp;h=356fb4505d436700ced125841435720f53994f18;hb=20c5f6fee688f2f501276fef7f30ea2b06c5375e;hp=5c077a0a296a768eb3b208cf054e2399f6bc89a4;hpb=96a5834c0752434e8129f8e0d604f83155b0bd48;p=kdenlive diff --git a/src/titledocument.cpp b/src/titledocument.cpp index 5c077a0a..356fb450 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -34,6 +34,11 @@ #include #include +#if QT_VERSION >= 0x040600 +#include +#include +#include +#endif TitleDocument::TitleDocument() { @@ -47,7 +52,7 @@ void TitleDocument::setScene(QGraphicsScene* _scene, int width, int height) m_height = height; } -QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) +QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* endv) { QDomDocument doc; @@ -91,7 +96,19 @@ QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonIt content.setAttribute("font-pixel-size", font.pixelSize()); content.setAttribute("font-italic", font.italic()); content.setAttribute("font-underline", font.underline()); - content.setAttribute("font-color", colorToString(t->defaultTextColor())); + { + QTextCursor cursor(t->document()); + cursor.select(QTextCursor::Document); + QColor fontcolor = cursor.charFormat().foreground().color(); + content.setAttribute("font-color", colorToString(fontcolor)); + if (!t->data(101).isNull()) content.setAttribute("font-outline", t->data(101).toDouble()); + if (!t->data(102).isNull()) content.setAttribute("font-outline-color", colorToString(QColor(t->data(102).toString()))); + } + if (!t->data(100).isNull()) { + QStringList effectParams = t->data(100).toStringList(); + QString effectName = effectParams.takeFirst(); + content.setAttribute(effectName, effectParams.join(";")); + } // Only save when necessary. if (t->data(OriginXLeft).toInt() == AxisInverted) { @@ -107,11 +124,20 @@ QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonIt default: continue; } + + // position QDomElement pos = doc.createElement("position"); pos.setAttribute("x", item->pos().x()); pos.setAttribute("y", item->pos().y()); QTransform transform = item->transform(); QDomElement tr = doc.createElement("transform"); + if (!item->data(ZOOMFACTOR).isNull()) { + tr.setAttribute("zoom", QString::number(item->data(ZOOMFACTOR).toInt())); + } + if (!item->data(ROTATEFACTOR).isNull()) { + QList rotlist = item->data(ROTATEFACTOR).toList(); + tr.setAttribute("rotation", QString("%1,%2,%3").arg(rotlist[0].toDouble()).arg(rotlist[1].toDouble()).arg(rotlist[2].toDouble())); + } tr.appendChild(doc.createTextNode( QString("%1,%2,%3,%4,%5,%6,%7,%8,%9").arg( transform.m11()).arg(transform.m12()).arg(transform.m13()).arg(transform.m21()).arg(transform.m22()).arg(transform.m23()).arg(transform.m31()).arg(transform.m32()).arg(transform.m33()) @@ -120,26 +146,40 @@ QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonIt e.setAttribute("z-index", item->zValue()); pos.appendChild(tr); +#if QT_VERSION >= 0x040600 + // effects + QGraphicsEffect *eff = item->graphicsEffect(); + if (eff) { + QGraphicsBlurEffect *blur = static_cast (eff); + QDomElement effect = doc.createElement("effect"); + if (blur) { + effect.setAttribute("type", "blur"); + effect.setAttribute("blurradius", blur->blurRadius()); + } else { + QGraphicsDropShadowEffect *shadow = static_cast (eff); + if (shadow) { + effect.setAttribute("type", "shadow"); + effect.setAttribute("blurradius", shadow->blurRadius()); + effect.setAttribute("xoffset", shadow->xOffset()); + effect.setAttribute("yoffset", shadow->yOffset()); + } + } + e.appendChild(effect); + } +#endif e.appendChild(pos); e.appendChild(content); - if (item->zValue() > -1100) main.appendChild(e); + if (item->zValue() > -1000) main.appendChild(e); } if (startv && endv) { QDomElement endp = doc.createElement("endviewport"); QDomElement startp = doc.createElement("startviewport"); - endp.setAttribute("x", endv->data(0).toString()); - endp.setAttribute("y", endv->data(1).toString()); - endp.setAttribute("size", endv->data(2).toString()); - endp.setAttribute("rect", rectFToString(endv->boundingRect())); - - startp.setAttribute("x", startv->data(0).toString()); - startp.setAttribute("y", startv->data(1).toString()); - startp.setAttribute("size", startv->data(2).toString()); - startp.setAttribute("rect", rectFToString(startv->boundingRect())); - - startp.setAttribute("z-index", startv->zValue()); - endp.setAttribute("z-index", endv->zValue()); + QRectF r(endv->pos().x(), endv->pos().y(), endv->rect().width(), endv->rect().height()); + endp.setAttribute("rect", rectFToString(r)); + QRectF r2(startv->pos().x(), startv->pos().y(), startv->rect().width(), startv->rect().height()); + startp.setAttribute("rect", rectFToString(r2)); + main.appendChild(startp); main.appendChild(endp); } @@ -169,7 +209,7 @@ QColor TitleDocument::getBackgroundColor() } -bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv, double out) +bool TitleDocument::saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int out) { if (!m_scene) return false; @@ -192,27 +232,7 @@ bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv, return KIO::NetAccess::upload(tmpfile.fileName(), url, 0); } -int TitleDocument::loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv, double *out) -{ - QString tmpfile; - QDomDocument doc; - if (!m_scene) - return -1; - - if (KIO::NetAccess::download(url, tmpfile, 0)) { - QFile file(tmpfile); - if (file.open(QIODevice::ReadOnly)) { - doc.setContent(&file, false); - file.close(); - } else - return -1; - KIO::NetAccess::removeTempFile(tmpfile); - return loadFromXml(doc, startv, endv, out); - } - return -1; -} - -int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv, double *out) +int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int *out) { QDomNodeList titles = doc.elementsByTagName("kdenlivetitle"); //TODO: Check if the opened title size is equal to project size, otherwise warn user and rescale @@ -220,15 +240,17 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q int doc_width = doc.documentElement().attribute("width").toInt(); int doc_height = doc.documentElement().attribute("height").toInt(); if (doc_width != m_width || doc_height != m_height) { - KMessageBox::information(kapp->activeWindow(), i18n("This title clip was created with a different frame size. It will now be converted to the current project's size."), i18n("Resizing Title Clip")); + KMessageBox::information(kapp->activeWindow(), i18n("This title clip was created with a different frame size."), i18n("Title Profile")); //TODO: convert using QTransform + m_width = doc_width; + m_height = doc_height; } } //TODO: get default title duration instead of hardcoded one if (doc.documentElement().hasAttribute("out")) - *out = doc.documentElement().attribute("out").toDouble(); + *out = doc.documentElement().attribute("out").toInt(); else - *out = 5000; + *out = 125; int maxZValue = 0; if (titles.size()) { @@ -264,7 +286,21 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q font.setPixelSize(txtProperties.namedItem("font-pixel-size").nodeValue().toInt()); QColor col(stringToColor(txtProperties.namedItem("font-color").nodeValue())); QGraphicsTextItem *txt = m_scene->addText(items.item(i).namedItem("content").firstChild().nodeValue(), font); - txt->setDefaultTextColor(col); + QTextCursor cursor(txt->document()); + cursor.select(QTextCursor::Document); + QTextCharFormat format; + if (txtProperties.namedItem("font-outline").nodeValue().toDouble() > 0.0) { + txt->setData(101, txtProperties.namedItem("font-outline").nodeValue().toDouble()); + txt->setData(102, stringToColor(txtProperties.namedItem("font-outline-color").nodeValue())); + format.setTextOutline( + QPen(QColor(stringToColor(txtProperties.namedItem("font-outline-color").nodeValue())), + txtProperties.namedItem("font-outline").nodeValue().toDouble(), + Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin) + ); + + } + format.setForeground(QBrush(col)); + cursor.mergeCharFormat(format); txt->setTextInteractionFlags(Qt::NoTextInteraction); if (txtProperties.namedItem("alignment").isNull() == false) { txt->setTextWidth(txt->boundingRect().width()); @@ -285,13 +321,19 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q txt->setData(OriginYTop, txtProperties.namedItem("kdenlive-axis-y-inverted").nodeValue().toInt()); } + // Effects + if (!txtProperties.namedItem("typewriter").isNull()) { + QStringList effData = QStringList() << "typewriter" << txtProperties.namedItem("typewriter").nodeValue(); + txt->setData(100, effData); + } + gitem = txt; } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") { QString rect = items.item(i).namedItem("content").attributes().namedItem("rect").nodeValue(); QString br_str = items.item(i).namedItem("content").attributes().namedItem("brushcolor").nodeValue(); QString pen_str = items.item(i).namedItem("content").attributes().namedItem("pencolor").nodeValue(); double penwidth = items.item(i).namedItem("content").attributes().namedItem("penwidth").nodeValue().toDouble(); - QGraphicsRectItem *rec = m_scene->addRect(stringToRect(rect), QPen(QBrush(stringToColor(pen_str)), penwidth), QBrush(stringToColor(br_str))); + QGraphicsRectItem *rec = m_scene->addRect(stringToRect(rect), QPen(QBrush(stringToColor(pen_str)), penwidth, Qt::SolidLine, Qt::SquareCap, Qt::RoundJoin), QBrush(stringToColor(br_str))); gitem = rec; } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsPixmapItem") { QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue(); @@ -312,12 +354,36 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q QPointF p(items.item(i).namedItem("position").attributes().namedItem("x").nodeValue().toDouble(), items.item(i).namedItem("position").attributes().namedItem("y").nodeValue().toDouble()); gitem->setPos(p); - gitem->setTransform(stringToTransform(items.item(i).namedItem("position").firstChild().firstChild().nodeValue())); + QDomElement trans = items.item(i).namedItem("position").firstChild().toElement(); + gitem->setTransform(stringToTransform(trans.firstChild().nodeValue())); + QString rotate = trans.attribute("rotation"); + if (!rotate.isEmpty()) gitem->setData(ROTATEFACTOR, stringToList(rotate)); + QString zoom = trans.attribute("zoom"); + if (!zoom.isEmpty()) gitem->setData(ZOOMFACTOR, zoom.toInt()); int zValue = items.item(i).attributes().namedItem("z-index").nodeValue().toInt(); if (zValue > maxZValue) maxZValue = zValue; gitem->setZValue(zValue); gitem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + +#if QT_VERSION >= 0x040600 + // effects + QDomNode eff = items.item(i).namedItem("effect"); + if (!eff.isNull()) { + QDomElement e = eff.toElement(); + if (e.attribute("type") == "blur") { + QGraphicsBlurEffect *blur = new QGraphicsBlurEffect(); + blur->setBlurRadius(e.attribute("blurradius").toInt()); + gitem->setGraphicsEffect(blur); + } else if (e.attribute("type") == "shadow") { + QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(); + shadow->setBlurRadius(e.attribute("blurradius").toInt()); + shadow->setOffset(e.attribute("xoffset").toInt(), e.attribute("yoffset").toInt()); + gitem->setGraphicsEffect(shadow); + } + } +#endif } + if (items.item(i).nodeName() == "background") { kDebug() << items.item(i).attributes().namedItem("color").nodeValue(); QColor color = QColor(stringToColor(items.item(i).attributes().namedItem("color").nodeValue())); @@ -331,23 +397,14 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q } } else if (items.item(i).nodeName() == "startviewport" && startv) { QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); - startv->setPolygon(stringToRect(rect)); - int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); - int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); - int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); - startv->setData(0, x); - startv->setData(1, y); - startv->setData(2, size); - //startv->setPos(p); + QRectF r = stringToRect(rect); + startv->setRect(0, 0, r.width(), r.height()); + startv->setPos(r.topLeft()); } else if (items.item(i).nodeName() == "endviewport" && endv) { QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); - endv->setPolygon(stringToRect(rect)); - int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); - int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); - int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); - endv->setData(0, x); - endv->setData(1, y); - endv->setData(2, size); + QRectF r = stringToRect(rect); + endv->setRect(0, 0, r.width(), r.height()); + endv->setPos(r.topLeft()); } } } @@ -384,6 +441,7 @@ QColor TitleDocument::stringToColor(const QString & s) return QColor(); return QColor(l.at(0).toInt(), l.at(1).toInt(), l.at(2).toInt(), l.at(3).toInt());; } + QTransform TitleDocument::stringToTransform(const QString& s) { QStringList l = s.split(','); @@ -395,3 +453,23 @@ QTransform TitleDocument::stringToTransform(const QString& s) l.at(6).toDouble(), l.at(7).toDouble(), l.at(8).toDouble() ); } + +QList TitleDocument::stringToList(const QString & s) +{ + QStringList l = s.split(','); + if (l.size() < 3) + return QList(); + return QList() << QVariant(l.at(0).toDouble()) << QVariant(l.at(1).toDouble()) << QVariant(l.at(2).toDouble()); +} + +int TitleDocument::frameWidth() const +{ + return m_width; +} + +int TitleDocument::frameHeight() const +{ + return m_height; +} + +