diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp index dc1a68101..ac477a7ca 100644 --- a/sources/editor/graphicspart/partterminal.cpp +++ b/sources/editor/graphicspart/partterminal.cpp @@ -179,10 +179,10 @@ qreal PartTerminal::rotation() const { } /** - @brief PartTerminal::setName + @brief PartTerminal::setTerminalName @param name */ -void PartTerminal::setName(QString& name) { +void PartTerminal::setTerminalName(const QString& name) { if (d -> m_name == name) return; d -> m_name = name; emit nameChanged(); diff --git a/sources/editor/graphicspart/partterminal.h b/sources/editor/graphicspart/partterminal.h index 3f0ca1b20..702af02f1 100644 --- a/sources/editor/graphicspart/partterminal.h +++ b/sources/editor/graphicspart/partterminal.h @@ -32,7 +32,7 @@ class PartTerminal : public CustomElementGraphicPart Q_OBJECT Q_PROPERTY(Qet::Orientation orientation READ orientation WRITE setOrientation) - Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(QString terminal_name READ terminalName WRITE setTerminalName) Q_PROPERTY(TerminalData::Type terminal_type READ terminalType WRITE setTerminalType) public: @@ -78,8 +78,10 @@ class PartTerminal : public CustomElementGraphicPart void setRotation(qreal angle); - QString name() const override { return d -> m_name; } - void setName(QString& name); + QString terminalName() const { return d -> m_name; } + void setTerminalName(const QString& name); + + QString name() const override { return QObject::tr("Borne");} TerminalData::Type terminalType() const {return d->m_type;} void setTerminalType(TerminalData::Type type); diff --git a/sources/editor/ui/qetelementeditor.cpp b/sources/editor/ui/qetelementeditor.cpp index a04abc846..311c84beb 100644 --- a/sources/editor/ui/qetelementeditor.cpp +++ b/sources/editor/ui/qetelementeditor.cpp @@ -469,6 +469,12 @@ void QETElementEditor::fillPartsList() if (CustomElementPart *cep = dynamic_cast(qgi)) { QString part_desc = cep -> name(); + if (PartTerminal *terminal = dynamic_cast(qgi)) { + const auto t_name { terminal->terminalName() } ; + if (!t_name.isEmpty()) { + part_desc += QLatin1String(" : ") + t_name; + } + } QListWidgetItem *qlwi = new QListWidgetItem(part_desc); QVariant v; #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove diff --git a/sources/editor/ui/terminaleditor.cpp b/sources/editor/ui/terminaleditor.cpp index 166ae76f7..de68261f4 100644 --- a/sources/editor/ui/terminaleditor.cpp +++ b/sources/editor/ui/terminaleditor.cpp @@ -60,7 +60,7 @@ void TerminalEditor::updateForm() ui->m_x_dsb->setValue(m_part->property("x").toReal()); ui->m_y_dsb->setValue(m_part->property("y").toReal()); ui->m_orientation_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->property("orientation"))); - ui->m_name_le->setText(m_part->name()); + ui->m_name_le->setText(m_part->terminalName()); ui->m_type_cb->setCurrentIndex(ui->m_orientation_cb->findData(m_part->terminalType())); activeConnections(true); @@ -181,9 +181,9 @@ void TerminalEditor::nameEdited() m_locked = true; QString name_(ui->m_name_le->text()); - if (m_part->name() != name_) + if (m_part->terminalName() != name_) { - auto undo = new QPropertyUndoCommand(m_part, "name", m_part->property("name"), name_); + auto undo = new QPropertyUndoCommand(m_part, "terminal_name", m_part->property("terminal_name"), name_); undo->setText(tr("Modifier le nom du terminal")); undoStack().push(undo); }