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/undocommand/deleteqgraphicsitemcommand.cpp

@@ -16,9 +16,11 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "deleteqgraphicsitemcommand.h"
+#include "../wiringrules.h"
 
 #include "../cable/cablemanager.h"
 #include "../diagram.h"
+#include "../qetproject.h"
 #include "addgraphicsobjectcommand.h"
 #include "../qetdiagrameditor.h"
 #include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
@@ -27,6 +29,7 @@
 #include "../qetgraphicsitem/dynamicelementtextitem.h"
 #include "../qetgraphicsitem/element.h"
 #include "../qetgraphicsitem/elementtextitemgroup.h"
+#include "../shownkinds.h"
 #include "../qetgraphicsitem/terminal.h"
 #include "addelementtextcommand.h"
 #include "../TerminalStrip/realterminal.h"
@@ -207,17 +210,44 @@ void DeleteQGraphicsItemCommand::setPotentialsOfRemovedElements()
 			}
 
 			ConductorProperties properties = hub_terminal->conductors().first()->properties();
-			for (Terminal *t : terminals_to_connect_list)
+
+				//Every terminal to the hub (a star), or, when the project
+				//limits the wires per terminal (discussion #1158), one after
+				//another (a chain): a star gives the hub a wire per other
+				//terminal, which the limit forbids.
+			QList<std::pair<Terminal *, Terminal *>> pairs;
+			const QETProject *project = hub_terminal->diagram() ? hub_terminal->diagram()->project() : nullptr;
+			if (project && WiringRules::chainsWires(project->wiringRules(), WiringRules::masterEnabled()))
+			{
+				QList<Terminal *> chain {hub_terminal};
+				chain << terminals_to_connect_list;
+				QList<QPointF> points;
+				for (Terminal *ct : std::as_const(chain)) {
+					points << ct->scenePos();
+				}
+				const QList<int> order = WiringRules::chainOrder(points);
+				for (int i = 1 ; i < order.size() ; ++i) {
+					pairs.append(std::make_pair(chain.at(order.at(i - 1)), chain.at(order.at(i))));
+				}
+			}
+			else
+			{
+				for (Terminal *t : std::as_const(terminals_to_connect_list)) {
+					pairs.append(std::make_pair(hub_terminal, t));
+				}
+			}
+
+			for (const auto &new_pair : std::as_const(pairs))
 			{
 					//If a conductor was already created between these two terminals
 					//in this undo command, from another removed element, we do nothing
 				bool exist_ = false;
 				for (std::pair<Terminal *, Terminal *> pair : m_connected_terminals)
 				{
-					if  (pair.first == hub_terminal && pair.second == t) {
+					if  (pair.first == new_pair.first && pair.second == new_pair.second) {
 						exist_ = true;
 						continue;
-					} else if (pair.first == t && pair.second == hub_terminal) {
+					} else if (pair.first == new_pair.second && pair.second == new_pair.first) {
 						exist_ = true;
 						continue;
 					}
@@ -225,11 +255,11 @@ void DeleteQGraphicsItemCommand::setPotentialsOfRemovedElements()
 
 				if (exist_ == false)
 				{
-					m_connected_terminals.append(std::make_pair<Terminal *, Terminal *>((Terminal *)hub_terminal, (Terminal *)t));
+					m_connected_terminals.append(new_pair);
 					qInfo() << "m_connected_terminals" << m_connected_terminals;
-					Conductor *new_cond = new Conductor(hub_terminal, t);
+					Conductor *new_cond = new Conductor(new_pair.first, new_pair.second);
 					new_cond->setProperties(properties);
-					new AddGraphicsObjectCommand(new_cond, t->diagram(), QPointF(), this);
+					new AddGraphicsObjectCommand(new_cond, new_pair.second->diagram(), QPointF(), this);
 				}
 			}
 		}
@@ -334,7 +364,8 @@ void DeleteQGraphicsItemCommand::redo()
 			//current conductor is visible (that mean the conductor have the single displayed text)
 			//We call adjustTextItemPosition to other conductor at the same potential to keep
 			//a visible text on this potential.
-		if (m_diagram -> defaultConductorProperties.m_one_text_per_folio && c -> textItem() -> isVisible())
+			//wantsVisible(): also while wire texts are hidden (View > Show)
+		if (m_diagram -> defaultConductorProperties.m_one_text_per_folio && ShownKinds::wantsVisible(c -> textItem()))
 		{
 			QList <Conductor *> conductor_list;
 			conductor_list << c -> relatedPotentialConductors(false).values();