#include <KDebug>
#include <KTemporaryFile>
#include <kio/netaccess.h>
+#include <KApplication>
+#include <KLocale>
+#include <KMessageBox>
#include <QGraphicsScene>
#include <QDomElement>
content.setAttribute("font-italic", font.italic());
content.setAttribute("font-underline", font.underline());
content.setAttribute("font-color", colorToString(t->defaultTextColor()));
-
- // Only save when necessary.
- if (t->data(OriginXLeft).toInt() == AxisInverted) {
- content.setAttribute("kdenlive-axis-x-inverted", t->data(OriginXLeft).toInt());
- }
- if (t->data(OriginYTop).toInt() == AxisInverted) {
- content.setAttribute("kdenlive-axis-y-inverted", t->data(OriginYTop).toInt());
- }
+
+ // Only save when necessary.
+ if (t->data(OriginXLeft).toInt() == AxisInverted) {
+ content.setAttribute("kdenlive-axis-x-inverted", t->data(OriginXLeft).toInt());
+ }
+ if (t->data(OriginYTop).toInt() == AxisInverted) {
+ content.setAttribute("kdenlive-axis-y-inverted", t->data(OriginYTop).toInt());
+ }
if (t->textWidth() != -1) {
content.setAttribute("alignment", t->textCursor().blockFormat().alignment());
}
if (startv && endv) {
QDomElement endp = doc.createElement("endviewport");
QDomElement startp = doc.createElement("startviewport");
- endp.setAttribute("x", endv->pos().x());
- endp.setAttribute("y", endv->pos().y());
- endp.setAttribute("size", endv->sceneBoundingRect().width() / 2);
+ 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->pos().x());
- startp.setAttribute("y", startv->pos().y());
- startp.setAttribute("size", startv->sceneBoundingRect().width() / 2);
+ 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());
return -1;
}
-int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* /*startv*/, QGraphicsPolygonItem* /*endv*/)
+int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv)
{
QDomNodeList titles = doc.elementsByTagName("kdenlivetitle");
int maxZValue = 0;
if (titles.size()) {
QDomNodeList items = titles.item(0).childNodes();
- for (int i = 0;i < items.count();i++) {
+ for (int i = 0; i < items.count(); i++) {
QGraphicsItem *gitem = NULL;
kDebug() << items.item(i).attributes().namedItem("type").nodeValue();
int zValue = items.item(i).attributes().namedItem("z-index").nodeValue().toInt();
font.setUnderline(txtProperties.namedItem("font-underline").nodeValue().toInt());
// Older Kdenlive version did not store pixel size but point size
if (txtProperties.namedItem("font-pixel-size").isNull()) {
+ KMessageBox::information(kapp->activeWindow(), i18n("Some of your text clips were saved with size in points, which means different sizes on different displays. They will be converted to pixel size, making them portable, but you could have to adjust their size."), i18n("Text Clips Updated"));
QFont f2;
f2.setPointSize(txtProperties.namedItem("font-size").nodeValue().toInt());
font.setPixelSize(QFontInfo(f2).pixelSize());
- } else font.setPixelSize(txtProperties.namedItem("font-pixel-size").nodeValue().toInt());
+ } else
+ 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);
cur.clearSelection();
txt->setTextCursor(cur);
}
-
- if (!txtProperties.namedItem("kdenlive-axis-x-inverted").isNull()) {
- txt->setData(OriginXLeft, txtProperties.namedItem("kdenlive-axis-x-inverted").nodeValue().toInt());
- }
- if (!txtProperties.namedItem("kdenlive-axis-y-inverted").isNull()) {
- txt->setData(OriginYTop, txtProperties.namedItem("kdenlive-axis-y-inverted").nodeValue().toInt());
- }
+
+ if (!txtProperties.namedItem("kdenlive-axis-x-inverted").isNull()) {
+ txt->setData(OriginXLeft, txtProperties.namedItem("kdenlive-axis-x-inverted").nodeValue().toInt());
+ }
+ if (!txtProperties.namedItem("kdenlive-axis-y-inverted").isNull()) {
+ txt->setData(OriginYTop, txtProperties.namedItem("kdenlive-axis-y-inverted").nodeValue().toInt());
+ }
gitem = txt;
} else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") {
break;
}
}
- } /*else if (items.item(i).nodeName() == "startviewport" && startv) {
- QPointF p(items.item(i).attributes().namedItem("x").nodeValue().toDouble(), items.item(i).attributes().namedItem("y").nodeValue().toDouble());
- double width = items.item(i).attributes().namedItem("size").nodeValue().toDouble();
- QRectF rect(-width, -width / aspect_ratio, width*2.0, width / aspect_ratio*2.0);
- kDebug() << width << rect;
- startv->setPolygon(rect);
- startv->setPos(p);
- } else if (items.item(i).nodeName() == "endviewport" && endv) {
- QPointF p(items.item(i).attributes().namedItem("x").nodeValue().toDouble(), items.item(i).attributes().namedItem("y").nodeValue().toDouble());
- double width = items.item(i).attributes().namedItem("size").nodeValue().toDouble();
- QRectF rect(-width, -width / aspect_ratio, width*2.0, width / aspect_ratio*2.0);
- kDebug() << width << rect;
- endv->setPolygon(rect);
- endv->setPos(p);
- }*/
+ } 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);
+ } 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);
+ }
}
}
return maxZValue;
QString TitleDocument::rectFToString(const QRectF& c)
{
QString ret = "%1,%2,%3,%4";
- ret = ret.arg(c.top()).arg(c.left()).arg(c.width()).arg(c.height());
+ ret = ret.arg(c.left()).arg(c.top()).arg(c.width()).arg(c.height());
return ret;
}
projects / kdenlive / blobdiff