From 7c8ea795e4f1202499fea82406ff5473b0bdfeb4 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Sun, 10 Dec 2017 01:03:36 +0000 Subject: [PATCH] Dissociate fonts policy and size for independent text item Possiblility to overide defaut settings by adding in QElectroTech.conf diagramitemsize, diagramitemfont variable, for example: [General] diagramitemsize=12 diagramitemfont=droid git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5163 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetapp.cpp | 25 +++++++++++++++++++++ sources/qetapp.h | 1 + sources/qetgraphicsitem/diagramtextitem.cpp | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 9f0ca5186..b919ffe37 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -778,6 +778,31 @@ QFont QETApp::diagramTextsFont(qreal size) } return(diagram_texts_font); } +/** + * @brief QETApp::diagramTextsItemFont + * the font for to use in independent text item + * @param size of font + * @return + */ +QFont QETApp::diagramTextsItemFont(qreal size) +{ + QSettings settings; + + //Font to use + QString diagram_texts_item_family = settings.value("diagramitemfont", "Sans Serif").toString(); + qreal diagram_texts_item_size = settings.value("diagramitemsize", 9.0).toDouble(); + + if (size != -1.0) { + diagram_texts_item_size = size; + } + QFont diagram_texts_item_font = QFont(diagram_texts_item_family); + diagram_texts_item_font.setPointSizeF(diagram_texts_item_size); + if (diagram_texts_item_size <= 4.0) { + diagram_texts_item_font.setWeight(QFont::Light); + } + return(diagram_texts_item_font); +} + /** @return les editeurs de schemas diff --git a/sources/qetapp.h b/sources/qetapp.h index 2ad729bbb..aceb93883 100644 --- a/sources/qetapp.h +++ b/sources/qetapp.h @@ -122,6 +122,7 @@ class QETApp : public QETSingleApplication { static void overrideLangDir(const QString &); static QString lang_dir; ///< Directory containing localization files. static QFont diagramTextsFont(qreal = -1.0); + static QFont diagramTextsItemFont(qreal = -1.0); static QETDiagramEditor *diagramEditorForFile(const QString &); static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child); static QList diagramEditors(); diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp index ab97207d2..4595f9e02 100644 --- a/sources/qetgraphicsitem/diagramtextitem.cpp +++ b/sources/qetgraphicsitem/diagramtextitem.cpp @@ -52,7 +52,7 @@ void DiagramTextItem::build() setZValue(10); setAcceptHoverEvents(true); setDefaultTextColor(Qt::black); - setFont(QETApp::diagramTextsFont()); + setFont(QETApp::diagramTextsItemFont()); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemSendsGeometryChanges); setNoEditable(false); setToolTip(tr("Maintenir ctrl pour un déplacement libre"));