From ee8114d42c7d3d58fc5e8c7a3258c3407e18cc54 Mon Sep 17 00:00:00 2001 From: Kellermorph Date: Wed, 29 Apr 2026 15:56:00 +0200 Subject: [PATCH 1/3] Fix Thumbnail in Makrotree --- .../fileelementcollectionitem.cpp | 63 ++++++++++--------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/sources/ElementsCollection/fileelementcollectionitem.cpp b/sources/ElementsCollection/fileelementcollectionitem.cpp index 3550dbec7..6d043dd05 100644 --- a/sources/ElementsCollection/fileelementcollectionitem.cpp +++ b/sources/ElementsCollection/fileelementcollectionitem.cpp @@ -296,45 +296,48 @@ void FileElementCollectionItem::addChildAtPath(const QString &collection_name) } /** - @brief FileElementCollectionItem::setUpData - SetUp the data of this item -*/ + * @brief FileElementCollectionItem::setUpData + * SetUp the data of this item + */ void FileElementCollectionItem::setUpData() { if (isDir()) { localName(); setFlags(Qt::ItemIsSelectable - | Qt::ItemIsDragEnabled - | Qt::ItemIsDropEnabled - | Qt::ItemIsEnabled); + | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled + | Qt::ItemIsEnabled); } else { setFlags(Qt::ItemIsSelectable - | Qt::ItemIsDragEnabled - | Qt::ItemIsEnabled); - - //Set the local name and all informations of the element - //in the data Qt::UserRole+1, these data will be use for search. - ElementsLocation loc(collectionPath()); - DiagramContext context = loc.elementInformations(); - QStringList search_list; - for (QString& key : context.keys()) - { search_list.append(context.value(key).toString()); } - search_list.append(localName(loc)); - setData(search_list.join(" ")); + | Qt::ItemIsDragEnabled + | Qt::ItemIsEnabled); + + if (m_path.endsWith(".qetmak")) { + setData(localName()); + } else { + // Parse standard element information for search + ElementsLocation loc(collectionPath()); + DiagramContext context = loc.elementInformations(); + QStringList search_list; + for (QString& key : context.keys()) + { search_list.append(context.value(key).toString()); } + search_list.append(localName(loc)); + setData(search_list.join(" ")); + } } setToolTip(collectionPath()); } /** - @brief FileElementCollectionItem::setUpIcon - SetUp the icon of this item. - Because icon use several memory, - we use this method for setup icon instead setUpData. -*/ + * @brief FileElementCollectionItem::setUpIcon + * SetUp the icon of this item. + * Because icon use several memory, + * we use this method for setup icon instead setUpData. + */ void FileElementCollectionItem::setUpIcon() { if (!icon().isNull()) @@ -349,17 +352,21 @@ void FileElementCollectionItem::setUpIcon() else if (m_path == QETApp::companyElementsDirN()) setIcon(QIcon(":/ico/16x16/go-company.png")); else if (m_path == macrosPath) - setIcon(QIcon(":/ico/16x16/go-home.png")); // <-- NEU: Icon für Makros (z.B. go-home) - else - setIcon(QIcon(":/ico/16x16/go-home.png")); + setIcon(QIcon(":/ico/16x16/go-home.png")); + else + setIcon(QIcon(":/ico/16x16/go-home.png")); } else { if (isDir()) { setIcon(QET::Icons::Folder); } else { - ElementsLocation loc(collectionPath()); - setIcon(loc.icon()); + if (m_path.endsWith(".qetmak")) { + setIcon(QIcon()); + } else { + ElementsLocation loc(collectionPath()); + setIcon(loc.icon()); + } } } } From b8c85f9e96fe32ed440ce67aad1d96ad5601e484 Mon Sep 17 00:00:00 2001 From: Kellermorph Date: Wed, 29 Apr 2026 16:15:58 +0200 Subject: [PATCH 2/3] Fix placing Template --- sources/diagramevent/diagrameventaddmacro.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/diagramevent/diagrameventaddmacro.cpp b/sources/diagramevent/diagrameventaddmacro.cpp index 6ca126cff..98f8f413a 100644 --- a/sources/diagramevent/diagrameventaddmacro.cpp +++ b/sources/diagramevent/diagrameventaddmacro.cpp @@ -245,10 +245,9 @@ void DiagramEventAddMacro::addMacro(QPointF final_pos) if (!diagram_node.isNull()) { QDomElement cloned_node = diagram_node.cloneNode(true).toElement(); + // Die fehlerhafte Offset-Addition wurde hier entfernt. + // target_pos ist einfach nur die Raster-Mausposition. QPointF target_pos = final_pos; - if (m_preview_item) { - target_pos += m_preview_item->offset(); - } DiagramContent pasted_content; From 946aa37e78db0a022fc8cbb49f506b7468c30c2d Mon Sep 17 00:00:00 2001 From: Kellermorph Date: Wed, 29 Apr 2026 16:17:49 +0200 Subject: [PATCH 3/3] delete german notes --- sources/ElementsCollection/fileelementcollectionitem.cpp | 3 +-- sources/diagramevent/diagrameventaddmacro.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sources/ElementsCollection/fileelementcollectionitem.cpp b/sources/ElementsCollection/fileelementcollectionitem.cpp index 6d043dd05..5f42efec4 100644 --- a/sources/ElementsCollection/fileelementcollectionitem.cpp +++ b/sources/ElementsCollection/fileelementcollectionitem.cpp @@ -179,7 +179,6 @@ QString FileElementCollectionItem::localName(const ElementsLocation &location) } else if (isElement()) { QString display_name = location.name(); - // Schneide die Endung .qetmak für die Anzeige ab if (display_name.endsWith(".qetmak")) { display_name.remove(".qetmak"); } @@ -216,7 +215,7 @@ QString FileElementCollectionItem::collectionPath() const else if (m_path == QETApp::companyElementsDirN()) return "company://"; else if (m_path == macrosPath) - return "macros://"; // <-- NEU: Protokoll für Makros zuweisen + return "macros://"; // else return "custom://"; } diff --git a/sources/diagramevent/diagrameventaddmacro.cpp b/sources/diagramevent/diagrameventaddmacro.cpp index 98f8f413a..556a5e42d 100644 --- a/sources/diagramevent/diagrameventaddmacro.cpp +++ b/sources/diagramevent/diagrameventaddmacro.cpp @@ -245,8 +245,6 @@ void DiagramEventAddMacro::addMacro(QPointF final_pos) if (!diagram_node.isNull()) { QDomElement cloned_node = diagram_node.cloneNode(true).toElement(); - // Die fehlerhafte Offset-Addition wurde hier entfernt. - // target_pos ist einfach nur die Raster-Mausposition. QPointF target_pos = final_pos; DiagramContent pasted_content;