From: Jean-Baptiste Mardelle Date: Wed, 20 Jan 2010 09:55:54 +0000 (+0000) Subject: Round recangle border in titles (patch from Till Theato) + small cleanup in titlewidg... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0db71755674c3b0a3a4bc264ddef5d8fb7ea955e;p=kdenlive Round recangle border in titles (patch from Till Theato) + small cleanup in titlewidget ui svn path=/trunk/kdenlive/; revision=4239 --- diff --git a/src/titledocument.cpp b/src/titledocument.cpp index ed9bc0b2..356fb450 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -333,7 +333,7 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGra 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(); diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 163db3b3..7139e193 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -724,6 +724,7 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) f.setAlpha(rectFAlpha->value()); QPen penf(f); penf.setWidth(rectLineWidth->value()); + penf.setJoinStyle(Qt::RoundJoin); rect->setPen(penf); QColor b = rectBColor->color(); b.setAlpha(rectBAlpha->value()); @@ -1484,6 +1485,7 @@ void TitleWidget::rectChanged() f.setAlpha(rectFAlpha->value()); QPen penf(f); penf.setWidth(rectLineWidth->value()); + penf.setJoinStyle(Qt::RoundJoin); rec->setPen(penf); QColor b = rectBColor->color(); b.setAlpha(rectBAlpha->value()); diff --git a/src/widgets/titlewidget_ui.ui b/src/widgets/titlewidget_ui.ui index 21776440..aa6e53a4 100644 --- a/src/widgets/titlewidget_ui.ui +++ b/src/widgets/titlewidget_ui.ui @@ -6,8 +6,8 @@ 0 0 - 900 - 579 + 977 + 633 @@ -45,143 +45,152 @@ - QFrame::StyledPanel + QFrame::NoFrame - QFrame::Raised + QFrame::Plain - 2 + 0 - - - - - +X - - - true - - - false - - - - - - - -5000 - - - 5000 - - - - - - - +Y - - - true - - - false - - - - - - - -5000 - - - 5000 - - - - - - - W - - - - - - - -1000 - - - 5000 - - - - - - - H - - - - - - - -1000 - - - 5000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Z-Index: - - - - - - - -5000 - - - 5000 - - - - + + + +X + + + true + + + false + + + + + + + -5000 + + + 5000 + + + + + + + +Y + + + true + + + false + + + + + + + -5000 + + + 5000 + + + + + + + W + + + + + + + -1000 + + + 5000 + + + + + + + H + + + + + + + -1000 + + + 5000 + + + + + + + Qt::Horizontal + + + + 94 + 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Z-Index: + + + + + + + -5000 + + + 5000 + +