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.
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 5.3 KiB |
@@ -1,48 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
|
||||
<!-- DIN rail -->
|
||||
<rect x="6" y="86" width="116" height="18" rx="3" fill="#7f8c8d"/>
|
||||
<rect x="6" y="92" width="116" height="6" fill="#4d4d4d"/>
|
||||
<!-- six terminal blocks: L, L, N, PE, L, spare -->
|
||||
<g fill="#eff0f1">
|
||||
<rect x="12" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="30" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="48" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="66" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="84" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="102" y="26" width="16" height="66" rx="2"/>
|
||||
</g>
|
||||
<!-- right-hand shading of each block -->
|
||||
<g fill="#bdc3c7">
|
||||
<rect x="24" y="28" width="4" height="62"/>
|
||||
<rect x="42" y="28" width="4" height="62"/>
|
||||
<rect x="60" y="28" width="4" height="62"/>
|
||||
<rect x="78" y="28" width="4" height="62"/>
|
||||
<rect x="96" y="28" width="4" height="62"/>
|
||||
<rect x="114" y="28" width="4" height="62"/>
|
||||
</g>
|
||||
<!-- colored marker bands -->
|
||||
<rect x="12" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="30" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="48" y="26" width="16" height="10" rx="2" fill="#3daee9"/>
|
||||
<rect x="66" y="26" width="16" height="10" rx="2" fill="#27ae60"/>
|
||||
<rect x="70" y="26" width="8" height="10" fill="#fdbc4b"/>
|
||||
<rect x="84" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="102" y="26" width="16" height="10" rx="2" fill="#da4453"/>
|
||||
<!-- screws -->
|
||||
<g fill="#31363b">
|
||||
<circle cx="20" cy="50" r="4.5"/><circle cx="20" cy="74" r="4.5"/>
|
||||
<circle cx="38" cy="50" r="4.5"/><circle cx="38" cy="74" r="4.5"/>
|
||||
<circle cx="56" cy="50" r="4.5"/><circle cx="56" cy="74" r="4.5"/>
|
||||
<circle cx="74" cy="50" r="4.5"/><circle cx="74" cy="74" r="4.5"/>
|
||||
<circle cx="92" cy="50" r="4.5"/><circle cx="92" cy="74" r="4.5"/>
|
||||
<circle cx="110" cy="50" r="4.5"/><circle cx="110" cy="74" r="4.5"/>
|
||||
</g>
|
||||
<g fill="#eff0f1">
|
||||
<rect x="16" y="49" width="8" height="2"/><rect x="16" y="73" width="8" height="2"/>
|
||||
<rect x="34" y="49" width="8" height="2"/><rect x="34" y="73" width="8" height="2"/>
|
||||
<rect x="52" y="49" width="8" height="2"/><rect x="52" y="73" width="8" height="2"/>
|
||||
<rect x="70" y="49" width="8" height="2"/><rect x="70" y="73" width="8" height="2"/>
|
||||
<rect x="88" y="49" width="8" height="2"/><rect x="88" y="73" width="8" height="2"/>
|
||||
<rect x="106" y="49" width="8" height="2"/><rect x="106" y="73" width="8" height="2"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 368 B |
|
Before Width: | Height: | Size: 425 B |
|
Before Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 198 B |
|
Before Width: | Height: | Size: 447 B |
|
Before Width: | Height: | Size: 375 B |
|
Before Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 274 B |
|
Before Width: | Height: | Size: 277 B |
|
Before Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 219 B |
|
Before Width: | Height: | Size: 219 B |
|
Before Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 358 B |
|
Before Width: | Height: | Size: 275 B |
|
Before Width: | Height: | Size: 316 B |
|
Before Width: | Height: | Size: 325 B |
|
Before Width: | Height: | Size: 373 B |
|
Before Width: | Height: | Size: 227 B |
|
Before Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 195 B |
|
Before Width: | Height: | Size: 339 B |
|
Before Width: | Height: | Size: 201 B |
|
Before Width: | Height: | Size: 397 B |
|
Before Width: | Height: | Size: 401 B |
|
Before Width: | Height: | Size: 210 B |
|
Before Width: | Height: | Size: 336 B |
|
Before Width: | Height: | Size: 328 B |
|
Before Width: | Height: | Size: 247 B |
|
Before Width: | Height: | Size: 300 B |
|
Before Width: | Height: | Size: 320 B |
|
Before Width: | Height: | Size: 268 B |
|
Before Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 289 B |
|
Before Width: | Height: | Size: 293 B |
|
Before Width: | Height: | Size: 289 B |
|
Before Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 516 B |
|
Before Width: | Height: | Size: 295 B |
|
Before Width: | Height: | Size: 267 B |
|
Before Width: | Height: | Size: 227 B |
|
Before Width: | Height: | Size: 281 B |
|
Before Width: | Height: | Size: 242 B |
|
Before Width: | Height: | Size: 223 B |
|
Before Width: | Height: | Size: 248 B |
|
Before Width: | Height: | Size: 230 B |
|
Before Width: | Height: | Size: 370 B |
|
Before Width: | Height: | Size: 429 B |
|
Before Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 433 B |
|
Before Width: | Height: | Size: 371 B |
|
Before Width: | Height: | Size: 417 B |
|
Before Width: | Height: | Size: 356 B |
|
Before Width: | Height: | Size: 167 B |
|
Before Width: | Height: | Size: 542 B |
|
Before Width: | Height: | Size: 418 B |
|
Before Width: | Height: | Size: 447 B |
|
Before Width: | Height: | Size: 227 B |
|
Before Width: | Height: | Size: 305 B |
|
Before Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 166 B |
|
Before Width: | Height: | Size: 484 B |
|
Before Width: | Height: | Size: 291 B |
|
Before Width: | Height: | Size: 603 B |
|
Before Width: | Height: | Size: 342 B |
|
Before Width: | Height: | Size: 391 B |
|
Before Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 268 B |
|
Before Width: | Height: | Size: 541 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 309 B |
|
Before Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 282 B |
|
Before Width: | Height: | Size: 427 B |
|
Before Width: | Height: | Size: 481 B |
|
Before Width: | Height: | Size: 276 B |
|
Before Width: | Height: | Size: 492 B |
|
Before Width: | Height: | Size: 299 B |
@@ -1,17 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
|
||||
<defs id="defs3051">
|
||||
<style type="text/css" id="current-color-scheme">
|
||||
.ColorScheme-Text {
|
||||
color:#4d4d4d;
|
||||
}
|
||||
.ColorScheme-NegativeText {
|
||||
color:#da4453;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<path
|
||||
style="fill:currentColor;fill-opacity:1;stroke:none"
|
||||
class="ColorScheme-NegativeText"
|
||||
d="M 8,2 A 6,6 0 0 0 2,8 6,6 0 0 0 8,14 6,6 0 0 0 14,8 6,6 0 0 0 8,2 Z M 5.70703,5 8,7.29297 10.29297,5 11,5.70703 8.70703,8 11,10.29297 10.29297,11 8,8.70703 5.70703,11 5,10.29297 7.29297,8 5,5.70703 5.70703,5 Z"
|
||||
/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 626 B |
|
Before Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 268 B |
|
Before Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 592 B |
|
Before Width: | Height: | Size: 211 B |
|
Before Width: | Height: | Size: 349 B |
|
Before Width: | Height: | Size: 376 B |