From 740b649976ffb60d49d91898c55eb7a1b7885ea1 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Sun, 10 Dec 2017 16:10:19 +0000 Subject: [PATCH] Add a Qfontdialog for choose policy for independent text item, not finished yet ! git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5166 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/configpages.cpp | 11 +++++++++++ sources/qetapp.cpp | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sources/configpages.cpp b/sources/configpages.cpp index 943c40cac..004043c5e 100644 --- a/sources/configpages.cpp +++ b/sources/configpages.cpp @@ -27,6 +27,8 @@ #include "qetproject.h" #include "reportproperties.h" #include "qetapp.h" +#include +#include /** * @brief NewDiagramPage::NewDiagramPage @@ -251,6 +253,15 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage terminal_exportlist_ = new QCheckBox(tr("Exporter les bornes dans la nomenclature"), projects_view_mode_); m_zoom_out_beyond_folio = new QCheckBox(tr("Autoriser le dézoom au delà du folio"), this); + bool ok; +QFont font = QFontDialog::getFont(&ok, QFont(), this); +if (ok) { + settings.setValue("diagramitemfont", font.family()); + settings.setValue("diagramitemsize", font.pointSize()); + settings.setValue("diagramitemweight", font.weight()); + settings.setValue("diagramitemstyle", font.styleName()); +} + elements_management_ = new QGroupBox(tr("Gestion des éléments"), this); highlight_integrated_elements_ = new QCheckBox(tr("Mettre en valeur dans le panel les éléments fraîchement intégrés", "configuration option")); default_element_infos_label_ = new QLabel( diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index b919ffe37..38b330f80 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -791,12 +791,16 @@ QFont QETApp::diagramTextsItemFont(qreal size) //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(); - + qreal diagram_texts_item_weight = settings.value("diagramitemweight").toDouble(); + QString diagram_texts_item_style = settings.value("diagramitemsstyle", "normal").toString(); + 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); + diagram_texts_item_font.setWeight(diagram_texts_item_weight); + diagram_texts_item_font.setStyleName(diagram_texts_item_style); if (diagram_texts_item_size <= 4.0) { diagram_texts_item_font.setWeight(QFont::Light); }