git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5178 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-12-12 18:05:22 +00:00
parent e6838ddd13
commit f873ab73c5
3 changed files with 46 additions and 48 deletions

View File

@@ -256,8 +256,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " +
settings.value("diagramitemfont").toString() + ")";
settings.value("diagramitemstyle").toString() + ")";
font_label = new QLabel(tr("Police des champs de texte"));
fontButton = new QPushButton(fontInfos);
fontButton->setMinimumHeight(28);
@@ -547,8 +546,7 @@ void GeneralConfigurationPage::setFont()
settings.setValue("diagramitemstyle", font.styleName());
QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " +
settings.value("diagramitemfont").toString() + ")";
settings.value("diagramitemstyle").toString() + ")";
fontButton->setText(fontInfos);
}
}

View File

@@ -792,7 +792,7 @@ QFont QETApp::diagramTextsItemFont(qreal size)
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();
QString diagram_texts_item_style = settings.value("diagramitemstyle", "normal").toString();
if (size != -1.0) {
diagram_texts_item_size = size;