diff --git a/sources/editor/graphicspart/partdynamictextfield.cpp b/sources/editor/graphicspart/partdynamictextfield.cpp index .. 100644 --- a/sources/editor/graphicspart/partdynamictextfield.cpp +++ b/sources/editor/graphicspart/partdynamictextfield.cpp @@ -95,7 +95,7 @@ root_element.setAttribute("z", QString::number(zValue())); root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation()))); root_element.setAttribute("font_size", font().pointSize()); - root_element.setAttribute("font_family", (QETApp::dynamicTextsItemFont().family())); + root_element.setAttribute("font_family", (QETApp::dynamicTextsItemFont().key())); root_element.setAttribute("uuid", m_uuid.toString()); root_element.setAttribute("frame", m_frame? "true" : "false"); root_element.setAttribute("text_width", QString::number(m_text_width)); diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index .. 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -33,6 +33,7 @@ #include "qetmessagebox.h" #include "projectview.h" #include "elementpicturefactory.h" +#include #include #include @@ -905,8 +906,6 @@ //Font to use QString dynamic_texts_item_family = settings.value("font_family", "Sans Serif").toString(); qreal dynamic_texts_item_size = settings.value("dynamicitemsize", 9.0).toDouble(); - qreal dynamic_texts_item_weight = settings.value("dynamicitemweight").toDouble(); - QString dynamic_texts_item_style = settings.value("dynamicitemstyle", "normal").toString(); if (size != -1.0) { dynamic_texts_item_size = size; @@ -913,8 +912,7 @@ } QFont dynamic_texts_item_font = QFont(dynamic_texts_item_family); dynamic_texts_item_font.setPointSizeF(dynamic_texts_item_size); - dynamic_texts_item_font.setWeight(dynamic_texts_item_weight); - dynamic_texts_item_font.setStyleName(dynamic_texts_item_style); + if (dynamic_texts_item_size <= 4.0) { dynamic_texts_item_font.setWeight(QFont::Light); } diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp index .. 100644 --- a/sources/qetgraphicsitem/diagramtextitem.cpp +++ b/sources/qetgraphicsitem/diagramtextitem.cpp @@ -20,6 +20,7 @@ #include "qetapp.h" #include "richtext/richtexteditor_p.h" #include "diagram.h" +#include /** * @brief DiagramTextItem::DiagramTextItem diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index .. 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -29,6 +29,7 @@ #include #include #include +#include /** * @brief DynamicElementTextItem::DynamicElementTextItem @@ -94,8 +95,8 @@ root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation()))); root_element.setAttribute("font_size", font().pointSize()); root_element.setAttribute("uuid", m_uuid.toString()); - root_element.setAttribute("font_family", font().family()); - root_element.setAttribute("dynamicitemstyle", font().styleName()); + root_element.setAttribute("font_family", font().key()); +// root_element.setAttribute("dynamicitemstyle", font().styleName()); root_element.setAttribute("frame", m_frame? "true" : "false"); root_element.setAttribute("text_width", QString::number(m_text_width)); @@ -162,9 +163,9 @@ } QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble()); - QFont font_(dom_elmt.attribute("font_family", font().family()), + QFont font_(dom_elmt.attribute("font_family", font().key()), dom_elmt.attribute("font_size", QString::number(9)).toInt()); - font_.setStyleName(dom_elmt.attribute("dynamicitemstyle", font().styleName())); + setFont(font_); m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString())); setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false); diff --git a/sources/qetgraphicsitem/independenttextitem.cpp b/sources/qetgraphicsitem/independenttextitem.cpp index .. 100644 --- a/sources/qetgraphicsitem/independenttextitem.cpp +++ b/sources/qetgraphicsitem/independenttextitem.cpp @@ -18,6 +18,7 @@ #include "independenttextitem.h" #include "qet.h" #include +#include /** Constructeur diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index .. 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -22,6 +22,7 @@ #include #include +#include /** * @brief GeneralConfigurationPage::GeneralConfigurationPage @@ -50,18 +51,16 @@ ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt()); QString fontInfos = settings.value("diagramitemfont").toString() + " " + - settings.value("diagramitemsize").toString() + " (" + - settings.value("diagramitemstyle").toString() + ")"; + settings.value("diagramitemsize").toString(); + ui->m_font_pb->setText(fontInfos); QString dynamicfontInfos = settings.value("font_family").toString() + " " + - settings.value("dynamicitemsize").toString() + " (" + - settings.value("dynamicitemstyle").toString() + ")"; + settings.value("dynamicitemsize").toString(); ui->m_dynamic_font_pb->setText(dynamicfontInfos); QString foliolistfontInfos = settings.value("foliolistfont").toString() + " " + - settings.value("foliolistsize").toString() + " (" + - settings.value("folioliststyle").toString() + ")"; + settings.value("foliolistsize").toString(); ui->m_folio_list_pb->setText(foliolistfontInfos); ui->m_rotation->setValue(settings.value("dynamic_rotation", 0).toInt()); @@ -257,13 +256,10 @@ QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this); if (ok) { - settings.setValue("diagramitemfont", font.family()); + settings.setValue("diagramitemfont", font.key()); settings.setValue("diagramitemsize", font.pointSize()); - settings.setValue("diagramitemweight", font.weight()); - settings.setValue("diagramitemstyle", font.styleName()); - QString fontInfos = settings.value("diagramitemfont").toString() + " " + - settings.value("diagramitemsize").toString() + " (" + - settings.value("diagramitemstyle").toString() + ")"; + + QString fontInfos = settings.value("diagramitemfont").toString(); ui->m_font_pb->setText(fontInfos); } } @@ -279,13 +275,10 @@ QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this); if (ok) { - settings.setValue("font_family", font.family()); + settings.setValue("font_family", font.key()); settings.setValue("dynamicitemsize", font.pointSize()); - settings.setValue("dynamicitemweight", font.weight()); - settings.setValue("dynamicitemstyle", font.styleName()); - QString fontInfos = settings.value("font_family").toString() + " " + - settings.value("dynamicitemsize").toString() + " (" + - settings.value("dynamicitemstyle").toString() + ")"; + + QString fontInfos = settings.value("font_family").toString(); ui->m_dynamic_font_pb->setText(fontInfos); } } @@ -302,13 +295,10 @@ QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this); if (ok) { - settings.setValue("foliolistfont", font.family()); + settings.setValue("foliolistfont", font.key()); settings.setValue("foliolistsize", font.pointSize()); - settings.setValue("foliolistweight", font.weight()); - settings.setValue("folioliststyle", font.styleName()); - QString fontInfos = settings.value("foliolistfont").toString() + " " + - settings.value("foliolistsize").toString() + " (" + - settings.value("folioliststyle").toString() + ")"; + + QString fontInfos = settings.value("foliolistfont").toString(); ui->m_folio_list_pb->setText(fontInfos); } }