From b8e4fca09f47ef02d04e45323db058966ebc8938 Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Sat, 8 Feb 2025 07:39:21 +0100 Subject: [PATCH 1/2] fix: remove empty elementInformation, but keep empty properties --- sources/diagramcontext.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp index 864ad9b3a..681fed49e 100644 --- a/sources/diagramcontext.cpp +++ b/sources/diagramcontext.cpp @@ -151,7 +151,10 @@ bool DiagramContext::operator!=(const DiagramContext &dc) const void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const { 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); // try to sort attributes by removing and re-adding property.removeAttribute("show"); From 58aae63616d64bd0edec37d5677e995fd34d088e Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Sat, 8 Feb 2025 07:45:48 +0100 Subject: [PATCH 2/2] =?UTF-8?q?sorted=20translations=20\=E2=80=9Cimported?= =?UTF-8?q?=20elements\=E2=80=9D=20in=20sourcecode=20and=20added=20some=20?= =?UTF-8?q?for=20Qt6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmlelementcollection.cpp | 77 ++++++++++--------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/sources/ElementsCollection/xmlelementcollection.cpp b/sources/ElementsCollection/xmlelementcollection.cpp index abddc7401..991a71085 100644 --- a/sources/ElementsCollection/xmlelementcollection.cpp +++ b/sources/ElementsCollection/xmlelementcollection.cpp @@ -117,46 +117,53 @@ XmlElementCollection::XmlElementCollection(QETProject *project) : 0x8981, 0x7D20}; - names.addName("fr", "Éléments importés"); - names.addName("en", "Imported elements"); - names.addName("nl_BE","Elementen geïmporteerd"); - names.addName("de", "Importierte elemente"); - names.addName("es", "Elementos importados"); - names.addName("ru", QString(russian_data, 24)); - names.addName("cs", "Zavedené prvky"); - names.addName("pl", "Elementy importowane"); - names.addName("pt", "elementos importados"); - names.addName("it", "Elementi importati"); - names.addName("el", QString(greek_data, 18)); - names.addName("nl", "Elementen geïmporteerd"); - names.addName("hr", "Uvezeni elementi"); - names.addName("ca", "Elements importats"); - names.addName("ro", "Elemente importate"); - names.addName("tr", QString(turkish_data, 12)); - names.addName("da", "Importerede elementer"); - names.addName("sl", "Uvoženi elementi"); - names.addName("ja", QString(japanese_data, 10)); - names.addName("uk", QString(ukrainian_data, 20)); + names.addName("ca", "Elements importats"); + names.addName("cs", "Zavedené prvky"); + names.addName("da", "Importerede elementer"); + names.addName("de", "Importierte elemente"); + names.addName("el", QString(greek_data, 18)); + names.addName("en", "Imported elements"); + names.addName("es", "Elementos importados"); + names.addName("fr", "Éléments importés"); + names.addName("hr", "Uvezeni elementi"); + names.addName("it", "Elementi importati"); + names.addName("ja", QString(japanese_data, 10)); + names.addName("nl_BE", "Elementen geïmporteerd"); + names.addName("nl", "Elementen geïmporteerd"); + names.addName("pl", "Elementy importowane"); + names.addName("pt_BR", "elementos importados"); + names.addName("pt", "elementos importados"); + names.addName("ro", "Elemente importate"); + names.addName("ru", QString(russian_data, 24)); + names.addName("sl", "Uvoženi elementi"); + names.addName("tr", QString(turkish_data, 12)); + names.addName("uk", QString(ukrainian_data, 20)); #else # if TODO_LIST # pragma message("@TODO remove code for QT 6 or later") # endif qDebug() << "Help code for QT 6 or later"; - names.addName("fr", "Éléments importés"); - names.addName("en", "Imported elements"); - names.addName("de", "Importierte elemente"); - names.addName("es", "Elementos importados"); - names.addName("cs", "Zavedené prvky"); - names.addName("pl", "Elementy importowane"); - names.addName("pt", "elementos importados"); - names.addName("it", "Elementi importati"); - names.addName("nl", "Elementen geïmporteerd"); - names.addName("hr", "Uvezeni elementi"); - names.addName("ca", "Elements importats"); - names.addName("ro", "Elemente importate"); - names.addName("da", "Importerede elementer"); - names.addName("sl", "Uvoženi elementi"); - names.addName("uk", "Імпортовані елементи"); + names.addName("ca", "Elements importats"); + names.addName("cs", "Zavedené prvky"); + names.addName("da", "Importerede elementer"); + names.addName("de", "Importierte elemente"); + names.addName("el", "Εισηγμένα στοιχεία"); + names.addName("en", "Imported elements"); + names.addName("es", "Elementos importados"); + names.addName("fr", "Éléments importés"); + names.addName("hr", "Uvezeni elementi"); + names.addName("it", "Elementi importati"); + names.addName("ja", "インバートされた要素"); + names.addName("nl_BE", "Elementen geïmporteerd"); + names.addName("nl", "Elementen geïmporteerd"); + names.addName("pl", "Elementy importowane"); + 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 import.appendChild(names.toXml(m_dom_document));