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

34
sources/configpages.cpp
View File

@@ -254,13 +254,12 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
terminal_exportlist_ = new QCheckBox(tr("Exporter les bornes dans la nomenclature"), projects_view_mode_); 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); m_zoom_out_beyond_folio = new QCheckBox(tr("Autoriser le dézoom au delà du folio"), this);
QString fontInfos = settings.value("diagramitemfont").toString() + " " + QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" + settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " + settings.value("diagramitemstyle").toString() + ")";
settings.value("diagramitemfont").toString() + ")"; font_label = new QLabel(tr("Police des champs de texte"));
font_label = new QLabel(tr("Police des champs de texte")); fontButton = new QPushButton(fontInfos);
fontButton = new QPushButton(fontInfos); fontButton->setMinimumHeight(28);
fontButton->setMinimumHeight(28);
elements_management_ = new QGroupBox(tr("Gestion des éléments"), this); 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")); highlight_integrated_elements_ = new QCheckBox(tr("Mettre en valeur dans le panel les éléments fraîchement intégrés", "configuration option"));
@@ -297,20 +296,20 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
appearance_ -> setLayout(appearance_layout); appearance_ -> setLayout(appearance_layout);
QVBoxLayout *projects_view_mode_layout = new QVBoxLayout; QVBoxLayout *projects_view_mode_layout = new QVBoxLayout;
QHBoxLayout *font_view_layout = new QHBoxLayout; QHBoxLayout *font_view_layout = new QHBoxLayout;
projects_view_mode_layout -> addWidget(windowed_mode_); projects_view_mode_layout -> addWidget(windowed_mode_);
projects_view_mode_layout -> addWidget(tabbed_mode_); projects_view_mode_layout -> addWidget(tabbed_mode_);
projects_view_mode_layout -> addWidget(m_zoom_out_beyond_folio); projects_view_mode_layout -> addWidget(m_zoom_out_beyond_folio);
projects_view_mode_layout -> addWidget(use_trackpad_); projects_view_mode_layout -> addWidget(use_trackpad_);
projects_view_mode_layout -> addWidget(save_label_paste_); projects_view_mode_layout -> addWidget(save_label_paste_);
projects_view_mode_layout -> addWidget(folio_panel_); projects_view_mode_layout -> addWidget(folio_panel_);
projects_view_mode_layout -> addWidget(terminal_exportlist_); projects_view_mode_layout -> addWidget(terminal_exportlist_);
font_view_layout->addWidget(font_label, 1); font_view_layout->addWidget(font_label, 1);
font_view_layout->addWidget(fontButton, 0); font_view_layout->addWidget(fontButton, 0);
projects_view_mode_layout-> addLayout(font_view_layout); projects_view_mode_layout-> addLayout(font_view_layout);
projects_view_mode_ -> setLayout(projects_view_mode_layout); projects_view_mode_ -> setLayout(projects_view_mode_layout);
connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont()));
QVBoxLayout *elements_management_layout = new QVBoxLayout(); QVBoxLayout *elements_management_layout = new QVBoxLayout();
@@ -418,7 +417,7 @@ void GeneralConfigurationPage::fillLang(QSettings &settings) {
lang_combo_box->addItem(QET::Icons::nl, tr("Pays-Bas"), "nl"); lang_combo_box->addItem(QET::Icons::nl, tr("Pays-Bas"), "nl");
lang_combo_box->addItem(QET::Icons::be, tr("Belgique-Flemish"), "be"); lang_combo_box->addItem(QET::Icons::be, tr("Belgique-Flemish"), "be");
//set current index to the lang found in setting file //set current index to the lang found in setting file
//if lang doesn't exist set to system //if lang doesn't exist set to system
for (int i=0; i<lang_combo_box->count(); i++) { for (int i=0; i<lang_combo_box->count(); i++) {
if (lang_combo_box->itemData(i).toString() == settings.value("lang").toString()) { if (lang_combo_box->itemData(i).toString() == settings.value("lang").toString()) {
@@ -538,17 +537,16 @@ QString PrintConfigPage::title() const {
void GeneralConfigurationPage::setFont() void GeneralConfigurationPage::setFont()
{ {
bool ok; bool ok;
QSettings settings; QSettings settings;
QFont font = QFontDialog::getFont(&ok, QFont(), this); QFont font = QFontDialog::getFont(&ok, QFont(), this);
if (ok) { if (ok) {
settings.setValue("diagramitemfont", font.family()); settings.setValue("diagramitemfont", font.family());
settings.setValue("diagramitemsize", font.pointSize()); settings.setValue("diagramitemsize", font.pointSize());
settings.setValue("diagramitemweight", font.weight()); settings.setValue("diagramitemweight", font.weight());
settings.setValue("diagramitemstyle", font.styleName()); settings.setValue("diagramitemstyle", font.styleName());
QString fontInfos = settings.value("diagramitemfont").toString() + " " + QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" + settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " + settings.value("diagramitemstyle").toString() + ")";
settings.value("diagramitemfont").toString() + ")";
fontButton->setText(fontInfos); 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(); 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_size = settings.value("diagramitemsize", 9.0).toDouble();
qreal diagram_texts_item_weight = settings.value("diagramitemweight").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) { if (size != -1.0) {
diagram_texts_item_size = size; diagram_texts_item_size = size;

58
sources/qetgraphicsitem/element.cpp
View File

@@ -488,16 +488,16 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
for(DynamicElementTextItem *deti : m_dynamic_text_list) for(DynamicElementTextItem *deti : m_dynamic_text_list)
delete deti; delete deti;
m_dynamic_text_list.clear(); m_dynamic_text_list.clear();
//************************// //************************//
//***Dynamic texts item***// //***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); DynamicElementTextItem *deti = new DynamicElementTextItem(this);
addDynamicTextItem(deti); addDynamicTextItem(deti);
deti->fromXml(qde); deti->fromXml(qde);
} }
//************************// //************************//
@@ -626,7 +626,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
} }
} }
} }
return(true); return(true);
} }
@@ -658,7 +658,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
QDomElement seq = m_autoNum_seq.toXml(document); QDomElement seq = m_autoNum_seq.toXml(document);
if (seq.hasChildNodes()) if (seq.hasChildNodes())
element.appendChild(seq); element.appendChild(seq);
// position, selection et orientation // position, selection et orientation
element.setAttribute("x", QString("%1").arg(pos().x())); element.setAttribute("x", QString("%1").arg(pos().x()));
element.setAttribute("y", QString("%1").arg(pos().y())); element.setAttribute("y", QString("%1").arg(pos().y()));
@@ -674,7 +674,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
} }
id_terminal = max_id_t + 1; id_terminal = max_id_t + 1;
} }
// enregistrement des bornes de l'appareil // enregistrement des bornes de l'appareil
QDomElement xml_terminals = document.createElement("terminals"); QDomElement xml_terminals = document.createElement("terminals");
// pour chaque enfant de l'element // pour chaque enfant de l'element
@@ -686,7 +686,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
xml_terminals.appendChild(terminal); xml_terminals.appendChild(terminal);
} }
element.appendChild(xml_terminals); element.appendChild(xml_terminals);
// enregistrement des champ de texte de l'appareil // enregistrement des champ de texte de l'appareil
QDomElement inputs = document.createElement("inputs"); QDomElement inputs = document.createElement("inputs");
foreach(ElementTextItem *eti, texts()) { foreach(ElementTextItem *eti, texts()) {
@@ -706,21 +706,21 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
element.appendChild(links_uuids); element.appendChild(links_uuids);
} }
//save information of this element //save information of this element
if (! m_element_informations.keys().isEmpty()) { if (! m_element_informations.keys().isEmpty()) {
QDomElement infos = document.createElement("elementInformations"); QDomElement infos = document.createElement("elementInformations");
m_element_informations.toXml(infos, "elementInformation"); m_element_informations.toXml(infos, "elementInformation");
element.appendChild(infos); element.appendChild(infos);
} }
//Dynamic texts //Dynamic texts
QDomElement dyn_text = document.createElement("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)); dyn_text.appendChild(deti->toXml(document));
QDomElement texts_group = document.createElement("texts_group"); QDomElement texts_group = document.createElement("texts_group");
//Dynamic texts owned by groups //Dynamic texts owned by groups
for(ElementTextItemGroup *group : m_texts_group) for(ElementTextItemGroup *group : m_texts_group)
{ {
//temporarily remove the texts from group to get the pos relative to element and not group. //temporarily remove the texts from group to get the pos relative to element and not group.
@@ -735,7 +735,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
group->removeFromGroup(deti); group->removeFromGroup(deti);
//Save the texts to xml //Save the texts to xml
for (DynamicElementTextItem *deti : deti_list) for(DynamicElementTextItem *deti : deti_list)
dyn_text.appendChild(deti->toXml(document)); dyn_text.appendChild(deti->toXml(document));
//Re add texts to group //Re add texts to group
@@ -754,7 +754,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
//Append the texts group to element //Append the texts group to element
element.appendChild(texts_group); element.appendChild(texts_group);
return(element); return(element);
} }
/** /**
@@ -765,18 +765,18 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
*/ */
void Element::addDynamicTextItem(DynamicElementTextItem *deti) void Element::addDynamicTextItem(DynamicElementTextItem *deti)
{ {
if (deti && !m_dynamic_text_list.contains(deti)) if (deti && !m_dynamic_text_list.contains(deti))
{ {
m_dynamic_text_list.append(deti); m_dynamic_text_list.append(deti);
deti->setParentItem(this); deti->setParentItem(this);
emit textAdded(deti); emit textAdded(deti);
} }
else else
{ {
DynamicElementTextItem *text = new DynamicElementTextItem(this); DynamicElementTextItem *text = new DynamicElementTextItem(this);
m_dynamic_text_list.append(text); m_dynamic_text_list.append(text);
emit textAdded(text); emit textAdded(text);
} }
} }
/** /**
@@ -787,9 +787,9 @@ void Element::addDynamicTextItem(DynamicElementTextItem *deti)
*/ */
void Element::removeDynamicTextItem(DynamicElementTextItem *deti) void Element::removeDynamicTextItem(DynamicElementTextItem *deti)
{ {
if (m_dynamic_text_list.contains(deti)) if (m_dynamic_text_list.contains(deti))
{ {
m_dynamic_text_list.removeOne(deti); m_dynamic_text_list.removeOne(deti);
deti->setParentItem(nullptr); deti->setParentItem(nullptr);
emit textRemoved(deti); emit textRemoved(deti);
return; return;