mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-01-08 22:59:58 +01:00
Element editor : minor fix
In the part list widget, the terminal name is empty if terminal haven't got name. Now "terminal" is always displayed and if the terminal have a name the name is appended to "terminal". Example : if the terminal name is 24 then the the part list widget show "terminal : 24"
This commit is contained in:
@@ -469,6 +469,12 @@ void QETElementEditor::fillPartsList()
|
||||
if (CustomElementPart *cep = dynamic_cast<CustomElementPart *>(qgi))
|
||||
{
|
||||
QString part_desc = cep -> name();
|
||||
if (PartTerminal *terminal = dynamic_cast<PartTerminal *>(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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user