kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 16:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #348 from plc-user/master

Browse Source 
fix: properties in project-file
This commit is contained in:
Laurent Trinques
2025-02-08 10:33:37 +01:00
committed by GitHub
parent 075289797a 58aae63616
commit 3ae47a714d
2 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
sources/ElementsCollection/xmlelementcollection.cpp
View File

@@ -117,46 +117,53 @@ XmlElementCollection::XmlElementCollection(QETProject *project) :
0x8981, 0x8981,
0x7D20}; 0x7D20};
names.addName("fr", "Éléments importés"); names.addName("ca", "Elements importats");
names.addName("en", "Imported elements"); names.addName("cs", "Zavedené prvky");
names.addName("nl_BE","Elementen geïmporteerd"); names.addName("da", "Importerede elementer");
names.addName("de", "Importierte elemente"); names.addName("de", "Importierte elemente");
names.addName("es", "Elementos importados"); names.addName("el", QString(greek_data, 18));
names.addName("ru", QString(russian_data, 24)); names.addName("en", "Imported elements");
names.addName("cs", "Zavedené prvky"); names.addName("es", "Elementos importados");
names.addName("pl", "Elementy importowane"); names.addName("fr", "Éléments importés");
names.addName("pt", "elementos importados"); names.addName("hr", "Uvezeni elementi");
names.addName("it", "Elementi importati"); names.addName("it", "Elementi importati");
names.addName("el", QString(greek_data, 18)); names.addName("ja", QString(japanese_data, 10));
names.addName("nl", "Elementen geïmporteerd"); names.addName("nl_BE", "Elementen geïmporteerd");
names.addName("hr", "Uvezeni elementi"); names.addName("nl", "Elementen geïmporteerd");
names.addName("ca", "Elements importats"); names.addName("pl", "Elementy importowane");
names.addName("ro", "Elemente importate"); names.addName("pt_BR", "elementos importados");
names.addName("tr", QString(turkish_data, 12)); names.addName("pt", "elementos importados");
names.addName("da", "Importerede elementer"); names.addName("ro", "Elemente importate");
names.addName("sl", "Uvoženi elementi"); names.addName("ru", QString(russian_data, 24));
names.addName("ja", QString(japanese_data, 10)); names.addName("sl", "Uvoženi elementi");
names.addName("uk", QString(ukrainian_data, 20)); names.addName("tr", QString(turkish_data, 12));
names.addName("uk", QString(ukrainian_data, 20));
#else #else
# if TODO_LIST # if TODO_LIST
# pragma message("@TODO remove code for QT 6 or later") # pragma message("@TODO remove code for QT 6 or later")
# endif # endif
qDebug() << "Help code for QT 6 or later"; qDebug() << "Help code for QT 6 or later";
names.addName("fr", "Éléments importés"); names.addName("ca", "Elements importats");
names.addName("en", "Imported elements"); names.addName("cs", "Zavedené prvky");
names.addName("de", "Importierte elemente"); names.addName("da", "Importerede elementer");
names.addName("es", "Elementos importados"); names.addName("de", "Importierte elemente");
names.addName("cs", "Zavedené prvky"); names.addName("el", "Εισηγμένα στοιχεία");
names.addName("pl", "Elementy importowane"); names.addName("en", "Imported elements");
names.addName("pt", "elementos importados"); names.addName("es", "Elementos importados");
names.addName("it", "Elementi importati"); names.addName("fr", "Éléments importés");
names.addName("nl", "Elementen geïmporteerd"); names.addName("hr", "Uvezeni elementi");
names.addName("hr", "Uvezeni elementi"); names.addName("it", "Elementi importati");
names.addName("ca", "Elements importats"); names.addName("ja", "インバートされた要素");
names.addName("ro", "Elemente importate"); names.addName("nl_BE", "Elementen geïmporteerd");
names.addName("da", "Importerede elementer"); names.addName("nl", "Elementen geïmporteerd");
names.addName("sl", "Uvoženi elementi"); names.addName("pl", "Elementy importowane");
names.addName("uk", "Імпортовані елементи"); names.addName("pt_BR", "elementos importados");
names.addName("pt", "elementos importados");
names.addName("ro", "Elemente importate");
names.addName("ru", "Импортированные элементы");
names.addName("sl", "Uvoženi elementi");
names.addName("tr", "İthal öğeler");
names.addName("uk", "Імпортовані елементи");
#endif #endif
import.appendChild(names.toXml(m_dom_document)); import.appendChild(names.toXml(m_dom_document));

5
sources/diagramcontext.cpp
View File

@@ -151,7 +151,10 @@ bool DiagramContext::operator!=(const DiagramContext &dc) const
void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const
{ {
foreach (QString key, keys()) { foreach (QString key, keys()) {
if (m_content[key].toString().trimmed().isEmpty()) { continue; } if ((tag_name == "elementInformation") &&
(m_content[key].toString().trimmed().isEmpty())) {
continue;
}
QDomElement property = e.ownerDocument().createElement(tag_name); QDomElement property = e.ownerDocument().createElement(tag_name);
// try to sort attributes by removing and re-adding // try to sort attributes by removing and re-adding
property.removeAttribute("show"); property.removeAttribute("show");