From 2f585840c6a3b42931347faf5129d2b6a298267c Mon Sep 17 00:00:00 2001 From: blacksun Date: Sat, 24 Nov 2018 21:12:27 +0000 Subject: [PATCH] Dynamic text item : load the good font from xml. Laurent, you can now sleep well :) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5603 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/diagramtextitem.cpp | 4 +++- sources/qetgraphicsitem/dynamicelementtextitem.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp index 3eb583aa5..0ca5175ec 100644 --- a/sources/qetgraphicsitem/diagramtextitem.cpp +++ b/sources/qetgraphicsitem/diagramtextitem.cpp @@ -153,7 +153,9 @@ QPointF DiagramTextItem::mapMovementFromParent(const QPointF &movement) const { void DiagramTextItem::setFontSize(int s) { prepareAlignment(); - setFont(QETApp::diagramTextsFont(s)); + QFont font_ = font(); + font_.setPointSize(s); + setFont(font_); finishAlignment(); emit fontSizeChanged(s); } diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index 982c01941..451e7cdd9 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -161,7 +161,9 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt) } QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble()); - setFont(QETApp::diagramTextsFont(dom_elmt.attribute("font_size", QString::number(9)).toInt())); + QFont font_(dom_elmt.attribute("dynamicitemfont", font().family()), + dom_elmt.attribute("font_size", QString::number(9)).toInt()); + setFont(font_); m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString())); setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false); setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());