kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-09-20 15:24:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pr721-merge

Browse Source 
# Conflicts:
#	sources/editor/ui/elementpropertieseditorwidget.cpp
This commit is contained in:
ispyisail
2026-09-04 22:05:13 +12:00
parent 7afc1eb56b b98589d3c7
commit 95d7b74e9e
176 changed files with 40380 additions and 32250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/editor/ui/elementpropertieseditorwidget.cpp
+4 -3
View File
@@ -423,13 +423,11 @@ void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int in
ui->m_master_gb->setVisible(master);
ui->m_terminal_gb->setVisible(terminal);
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
ui->tabWidget->setTabVisible(1,
(type_ == ElementData::Simple ||
type_ == ElementData::Master ||
type_ == ElementData::Slave ||
type_ == ElementData::Terminal));
#endif
updateTree();
}
@@ -456,6 +454,9 @@ void ElementPropertiesEditorWidget::on_m_slave_groups_checkbox_toggled(bool chec
if (checked && !ui->max_slaves_checkbox->isChecked()) {
ui->max_slaves_checkbox->setChecked(true);
if (!m_data.m_slave_contact_groups.isEmpty()) {
ui->max_slaves_spinbox->setValue(m_data.m_slave_contact_groups.size());
}
}
if (checked) {
@@ -691,7 +692,7 @@ void ElementPropertiesEditorWidget::createPlcConfigWidgets()
m_plc_table->horizontalHeader()->resizeSection(2, 150);
m_plc_table->horizontalHeader()->resizeSection(3, 150);
m_plc_table->horizontalHeader()->resizeSection(4, 100);
m_plc_table->setSelectionBehavior(QAbstractItemView::SelectItems);
m_plc_table->setSelectionBehavior(QAbstractItemView::SelectRows);
m_plc_table->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_plc_table->setMinimumHeight(200);
m_plc_table->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);