From 9c6f6024394c573363f8ed790447d4f6f501e6d3 Mon Sep 17 00:00:00 2001 From: xavierqet Date: Wed, 9 Jul 2008 17:30:52 +0000 Subject: [PATCH] Les textes des elements, des conducteurs, du cartouche ainsi que les textes independants utilisent desormais tous la meme police. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@345 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- customelement.cpp | 1 - diagramtextitem.cpp | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/customelement.cpp b/customelement.cpp index c6befb376..8a96b6d49 100644 --- a/customelement.cpp +++ b/customelement.cpp @@ -418,7 +418,6 @@ bool CustomElement::parseInput(QDomElement &e) { ) return(false); ElementTextItem *eti = new ElementTextItem(e.attribute("text"), this); - eti -> setFont(QFont(QETApp::diagramTextsFont(), size)); eti -> setPos(pos_x, pos_y); eti -> setOriginalPos(QPointF(pos_x, pos_y)); if (e.attribute("rotate") == "true") eti -> setFollowParentRotations(true); diff --git a/diagramtextitem.cpp b/diagramtextitem.cpp index b20af2825..28765e924 100644 --- a/diagramtextitem.cpp +++ b/diagramtextitem.cpp @@ -17,6 +17,7 @@ */ #include "diagramtextitem.h" #include "diagramcommands.h" +#include "qetapp.h" /** Constructeur @@ -27,6 +28,7 @@ DiagramTextItem::DiagramTextItem(QGraphicsItem *parent, QGraphicsScene *scene) : QGraphicsTextItem(parent, scene) { setDefaultTextColor(Qt::black); + setFont(QFont(QETApp::diagramTextsFont(), 9)); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable); connect(this, SIGNAL(lostFocus()), this, SLOT(setNonFocusable())); } @@ -42,6 +44,7 @@ DiagramTextItem::DiagramTextItem(const QString &text, QGraphicsItem *parent, QGr previous_text(text) { setDefaultTextColor(Qt::black); + setFont(QFont(QETApp::diagramTextsFont(), 9)); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable); connect(this, SIGNAL(lostFocus()), this, SLOT(setNonFocusable())); }