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
This commit is contained in:
scorpio810
2017-12-10 01:03:36 +00:00
parent 4f366490b9
commit 7c8ea795e4
3 changed files with 27 additions and 1 deletions

View File

@@ -778,6 +778,31 @@ QFont QETApp::diagramTextsFont(qreal size)
} }
return(diagram_texts_font); 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 @return les editeurs de schemas

View File

@@ -122,6 +122,7 @@ class QETApp : public QETSingleApplication {
static void overrideLangDir(const QString &); static void overrideLangDir(const QString &);
static QString lang_dir; ///< Directory containing localization files. static QString lang_dir; ///< Directory containing localization files.
static QFont diagramTextsFont(qreal = -1.0); static QFont diagramTextsFont(qreal = -1.0);
static QFont diagramTextsItemFont(qreal = -1.0);
static QETDiagramEditor *diagramEditorForFile(const QString &); static QETDiagramEditor *diagramEditorForFile(const QString &);
static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child); static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child);
static QList<QETDiagramEditor *> diagramEditors(); static QList<QETDiagramEditor *> diagramEditors();

View File

@@ -52,7 +52,7 @@ void DiagramTextItem::build()
setZValue(10); setZValue(10);
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
setDefaultTextColor(Qt::black); setDefaultTextColor(Qt::black);
setFont(QETApp::diagramTextsFont()); setFont(QETApp::diagramTextsItemFont());
setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemSendsGeometryChanges); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemSendsGeometryChanges);
setNoEditable(false); setNoEditable(false);
setToolTip(tr("Maintenir ctrl pour un déplacement libre")); setToolTip(tr("Maintenir ctrl pour un déplacement libre"));