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/properties/xrefproperties.cpp

@@ -22,6 +22,36 @@
 #include <QHash>
 #include <QMetaEnum>
 
+namespace {
+/**
+	@brief xrefPosFromKey
+	@param key : stored name of the position, e.g. "AlignBottom"
+	@return the position, or Qt::AlignBottom if key is empty or not one of
+	the positions the cross-reference settings offer. Older versions saved
+	an empty "xrefpos", which drew the cross-reference over the label.
+*/
+Qt::AlignmentFlag xrefPosFromKey(const QString &key)
+{
+	bool ok = false;
+	const int value = QMetaEnum::fromType<Qt::Alignment>()
+			.keyToValue(key.toStdString().data(), &ok);
+	if (!ok)
+		return Qt::AlignBottom;
+
+	switch (value) {
+		case Qt::AlignBottom:
+		case Qt::AlignTop:
+		case Qt::AlignLeft:
+		case Qt::AlignRight:
+		case Qt::AlignBaseline:
+		case Qt::AlignHCenter:
+			return Qt::AlignmentFlag(value);
+		default:
+			return Qt::AlignBottom;
+	}
+}
+}
+
 /**
 	@brief XRefProperties::XRefProperties
 	Default Constructor
@@ -31,6 +61,7 @@ XRefProperties::XRefProperties()
 	m_show_power_ctc = true;
 	m_show_terminal_name = true;
 	m_show_all_configured_slaves = false;
+	m_stack_overlapping = true;
 	m_display = Cross;
 	m_snap_to = Bottom;
 	m_prefix_keys << "power" << "delay" << "switch";
@@ -54,6 +85,7 @@ void XRefProperties::toSettings(QSettings &settings,
 	settings.setValue(prefix % "showpowerctc", m_show_power_ctc);
 	settings.setValue(prefix % "showterminalname", m_show_terminal_name);
 	settings.setValue(prefix % "showallconfiguredslaves", m_show_all_configured_slaves);
+	settings.setValue(prefix % "stackoverlapping", m_stack_overlapping);
 	QString display = m_display == Cross? "cross" : "contacts";
 	settings.setValue(prefix % "displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -89,6 +121,7 @@ void XRefProperties::fromSettings(const QSettings &settings,
 	m_show_power_ctc = settings.value(prefix % "showpowerctc", true).toBool();
 	m_show_terminal_name = settings.value(prefix % "showterminalname", true).toBool();
 	m_show_all_configured_slaves = settings.value(prefix % "showallconfiguredslaves", false).toBool();
+	m_stack_overlapping = settings.value(prefix % "stackoverlapping", true).toBool();
 	QString display = settings.value(prefix % "displayhas", "cross").toString();
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = settings.value(prefix % "snapto", "label").toString();
@@ -99,8 +132,7 @@ void XRefProperties::fromSettings(const QSettings &settings,
 	m_slave_label = settings.value(prefix % "slave_label", "(%f-%l%c)").toString();
 	m_font = settings.value(prefix % "font").toString();
 
-	QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
-	m_xref_pos = Qt::AlignmentFlag(var.keyToValue((settings.value(prefix % "xrefpos", "AlignBottom").toString()).toStdString().data()));
+	m_xref_pos = xrefPosFromKey(settings.value(prefix % "xrefpos").toString());
 
 	for (QString key : m_prefix_keys) {
 		m_prefix.insert(key, settings.value(prefix + key % "prefix").toString());
@@ -122,6 +154,7 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 	xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
 	xml_element.setAttribute("showterminalname", m_show_terminal_name? "true" : "false");
 	xml_element.setAttribute("showallconfiguredslaves", m_show_all_configured_slaves? "true" : "false");
+	xml_element.setAttribute("stackoverlapping", m_stack_overlapping? "true" : "false");
 	QString display = m_display == Cross? "cross" : "contacts";
 	xml_element.setAttribute("displayhas", display);
 	QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -156,19 +189,13 @@ bool XRefProperties::fromXml(const QDomElement &xml_element) {
 	m_show_power_ctc = xml_element.attribute("showpowerctc")  == "true";
 	m_show_terminal_name = xml_element.attribute("showterminalname", "true") == "true";
 	m_show_all_configured_slaves = xml_element.attribute("showallconfiguredslaves", "false") == "true";
+	m_stack_overlapping = xml_element.attribute("stackoverlapping", "true") == "true";
 	QString display = xml_element.attribute("displayhas", "cross");
 	display == "cross"? m_display = Cross : m_display = Contacts;
 	QString snap = xml_element.attribute("snapto", "label");
 	snap == "bottom"? m_snap_to = Bottom : m_snap_to = Label;
 
-	QString xrefpos = xml_element.attribute("xrefpos","Left");
-
-	QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
-
-	if(xml_element.hasAttribute("xrefpos"))
-		m_xref_pos = Qt::AlignmentFlag(var.keyToValue(xml_element.attribute("xrefpos").toStdString().data()));
-	else
-		m_xref_pos = Qt::AlignBottom;
+	m_xref_pos = xrefPosFromKey(xml_element.attribute("xrefpos"));
 
 	m_offset = xml_element.attribute("offset", "0").toInt();
 	m_slave_offset = xml_element.attribute("slave_offset", "0").toInt();
@@ -220,6 +247,7 @@ bool XRefProperties::operator ==(const XRefProperties &xrp) const{
 	return (m_show_power_ctc == xrp.m_show_power_ctc
 			&& m_show_terminal_name == xrp.m_show_terminal_name
 			&& m_show_all_configured_slaves == xrp.m_show_all_configured_slaves
+			&& m_stack_overlapping == xrp.m_stack_overlapping
 			&& m_display     == xrp.m_display
 			&& m_snap_to     == xrp.m_snap_to
 			&& m_prefix      == xrp.m_prefix