Compare commits

...

2 Commits

Author SHA1 Message Date
Jean-Baptiste Mardelle
96f64cfa4d Fix titleclip text position and outline width incorrectly saved on some locales
CCBUG: 347181
2015-05-04 23:42:42 +02:00
Jean-Baptiste Mardelle
375e4b3545 Improve bookmark compatibility (based on comment from Emmanuel Pescosta) 2015-05-04 21:33:42 +02:00
2 changed files with 6 additions and 6 deletions

View File

@@ -1669,7 +1669,7 @@ void KdenliveDoc::updateProjectFolderPlacesEntry()
*/
const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel";
KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
KBookmarkManager *bookmarkManager = KBookmarkManager::managerForExternalFile(file);
if (!bookmarkManager) return;
KBookmarkGroup root = bookmarkManager->root();

View File

@@ -173,7 +173,7 @@ QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* en
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(101).isNull()) content.setAttribute("font-outline", QString::number(t->data(101).toDouble()));
if (!t->data(102).isNull()) {
QVariant variant = t->data(102);
QColor outlineColor = variant.value<QColor>();
@@ -183,7 +183,7 @@ QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* en
if (!t->data(100).isNull()) {
QStringList effectParams = t->data(100).toStringList();
QString effectName = effectParams.takeFirst();
content.setAttribute("textwidth", t->sceneBoundingRect().width());
content.setAttribute("textwidth", QString::number(t->sceneBoundingRect().width()));
content.setAttribute(effectName, effectParams.join(";"));
}
@@ -204,8 +204,8 @@ QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* en
// position
QDomElement pos = doc.createElement("position");
pos.setAttribute("x", item->pos().x());
pos.setAttribute("y", item->pos().y());
pos.setAttribute("x", QString::number(item->pos().x()));
pos.setAttribute("y", QString::number(item->pos().y()));
QTransform transform = item->transform();
QDomElement tr = doc.createElement("transform");
if (!item->data(ZOOMFACTOR).isNull()) {
@@ -230,7 +230,7 @@ QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* en
QDomElement effect = doc.createElement("effect");
if (blur) {
effect.setAttribute("type", "blur");
effect.setAttribute("blurradius", blur->blurRadius());
effect.setAttribute("blurradius", QString::number(blur->blurRadius()));
} /*else {
//WARNING:those effects are anyways broken because they use QPixmaps which are not safe for MLT's threaded workflow
QGraphicsDropShadowEffect *shadow = static_cast <QGraphicsDropShadowEffect *>(eff);