Merge remote-tracking branch 'upstream/master' into wiring-manager

Conflicts resolved in 24 files. Notable decisions:

- ico/icon-themes.qrc: upstream's icon folder restructure kept; the 36
  cable icon entries re-added under the new qet/qet-dark path scheme
  (XML valid, every referenced file exists).
- Toolbar system: upstream's DiagramToolbarSettings now owns the
  toolbar filling. The cable tool is registered as
  diagrameditor.add_cable (generic group loop) and listed on the
  "diagram" toolbar right after the auto-break conductor action,
  separated by a divider, exactly like before the merge.
- Paste: the cable lines of a copy are handed to
  PasteNumberingImport::push() as extra commands, so paste + cable
  lines + the numbering question stay ONE undo step on both paste
  paths (DiagramView::paste and DiagramEventAddPaste::commit).
- PDF links: upstream's deterministic link sorting kept together with
  the cable cross-reference injector (injectLinkTo -> links list).
- Element renumbering: upstream's ElementAutoNumSchemeCommand::renumber
  replaces the old formula-based body of
  QETProject::renumberElementsBySchemeTitle; the cable numbering rule
  API (cableAutoNum, axis priority, rule name) is kept in full.
- Auto-numbering pages: upstream's scheme management kept, the Câbles
  tab added as index 4 (changeToCableTab), both entry points
  changeToCable() and changeToElement() kept side by side.
- SelectAutonumW: dirty tracking and the contextEdited signal moved
  into upstream's insertPartRow() row API, so single-rule mode, the
  rule-removable button and "confirm without change leaves the project
  alone" keep working.
- xrefpropertieswidget: upstream's offset clamping kept; the cable
  branch (Texte field, Police button, hidden display options) kept;
  the stack-overlapping checkbox is hidden for cables.

Verified after the merge: build green (515/515, no errors), ctest
85/86 (only the pre-existing headless tst_menubarkeyboard failure),
offscreen smoke exit 124.

sources/ui/xrefpropertieswidget.cpp

@@ -182,14 +182,22 @@ void XRefPropertiesWidget::saveProperties(int index) {
 	xrp.setShowPowerContac(ui->m_show_power_cb->isChecked());
 	xrp.setShowTerminalName(ui->m_show_terminal_name_cb->isChecked());
 	xrp.setShowAllConfiguredSlaves(ui->m_show_all_slaves_cb->isChecked());
+	xrp.setStackOverlapping(ui->m_stack_overlapping_cb->isChecked());
 	xrp.setPrefix("power",  ui->m_power_prefix_le->text());
 	xrp.setPrefix("delay",  ui->m_delay_prefix_le->text());
 	xrp.setPrefix("switch", ui->m_switch_prefix_le->text());
 	xrp.setMasterLabel(ui->m_master_le->text());
 	xrp.setSlaveLabel(ui->m_slave_le->text());
 	xrp.setFont(m_current_font);
-	xrp.setOffset(ui->m_offset_sb->value());
-	xrp.setSlaveOffset(ui->m_slave_offset_sb->value());
+		//The boxes cannot show a value below their minimum (the offset's
+		//minimum is its "Default" entry, standing for the stored 0): keep
+		//the stored value unless the box shows something else.
+	if (ui->m_offset_sb->value() != qBound(ui->m_offset_sb->minimum(), xrp.offset(),
+										   ui->m_offset_sb->maximum()))
+		xrp.setOffset(ui->m_offset_sb->value());
+	if (ui->m_slave_offset_sb->value() != qBound(ui->m_slave_offset_sb->minimum(), xrp.slaveOffset(),
+												 ui->m_slave_offset_sb->maximum()))
+		xrp.setSlaveOffset(ui->m_slave_offset_sb->value());
 
 	m_properties.insert(type, xrp);
 }
@@ -235,6 +243,8 @@ void XRefPropertiesWidget::updateDisplay()
 		ui->m_snap_to_cb->setCurrentIndex(ui->m_snap_to_cb->findData("label"));
 		ui->m_offset_sb->setEnabled(false);
 	}
+	ui->m_stack_overlapping_cb->setChecked(xrp.stackOverlapping());
+	ui->m_stack_overlapping_cb->setEnabled(ui->m_offset_sb->isEnabled());
 
 	if(xrp.getXrefPos() == Qt::AlignTop) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("top"));
 	else if(xrp.getXrefPos() == Qt::AlignLeft) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("left"));
@@ -297,6 +307,9 @@ void XRefPropertiesWidget::updateDisplay()
 		}
 	}
 
+		//A cable stacks the lines of its references by itself, so the
+		//option is only worth showing for the elements.
+	ui->m_stack_overlapping_cb->setVisible(!is_plc && !is_cable);
 	ui->m_cross_properties_gb->setVisible(!is_plc && !is_cable);
 }
 
@@ -325,6 +338,7 @@ void XRefPropertiesWidget::enableOffsetSB(int i){
 		ui->m_offset_sb->setEnabled(false);
 	else
 		ui->m_offset_sb->setEnabled(true);
+	ui->m_stack_overlapping_cb->setEnabled(ui->m_offset_sb->isEnabled());
 }
 
 /**