kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-05-09 18:39:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #455 from Kellermorph/makro-fix
Some checks failed
Auto-build doxygen docs / doxygen (push) Failing after 2m38s
Details
Auto-build doxygen docs / deploy (push) Has been skipped
Details

Browse Source 
Fix Thumbnail in Makrotree
This commit is contained in:
Laurent Trinques
2026-04-29 17:37:19 +02:00
committed by GitHub
parent 0abfecd891 946aa37e78
commit bbf156c489
2 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sources/ElementsCollection/fileelementcollectionitem.cpp
View File

@@ -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://";
}
@@ -296,45 +295,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 +351,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());
}
}
}
}

3
sources/diagramevent/diagrameventaddmacro.cpp
View File

@@ -246,9 +246,6 @@ void DiagramEventAddMacro::addMacro(QPointF final_pos)
QDomElement cloned_node = diagram_node.cloneNode(true).toElement();
QPointF target_pos = final_pos;
if (m_preview_item) {
target_pos += m_preview_item->offset();
}
DiagramContent pasted_content;