kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/configpages.cpp
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);
}
}

2
sources/qetapp.cpp
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;

6
sources/qetgraphicsitem/element.cpp
View File

@@ -492,7 +492,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
//************************//
//***Dynamic texts item***//
//************************//
for (QDomElement qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTaggName()))
for(QDomElement qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTaggName()))
{
DynamicElementTextItem *deti = new DynamicElementTextItem(this);
addDynamicTextItem(deti);
@@ -715,7 +715,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
//Dynamic texts
QDomElement dyn_text = document.createElement("dynamic_texts");
for (DynamicElementTextItem *deti : m_dynamic_text_list)
for(DynamicElementTextItem *deti : m_dynamic_text_list)
dyn_text.appendChild(deti->toXml(document));
QDomElement texts_group = document.createElement("texts_group");
@@ -735,7 +735,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
group->removeFromGroup(deti);
//Save the texts to xml
for (DynamicElementTextItem *deti : deti_list)
for(DynamicElementTextItem *deti : deti_list)
dyn_text.appendChild(deti->toXml(document));
//Re add texts to group