mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 06:34:14 +02:00
Kellermorph
955dfb3a73
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.
369 lines
12 KiB
XML
369 lines
12 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>XRefPropertiesWidget</class>
|
|
<widget class="QWidget" name="XRefPropertiesWidget">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>376</width>
|
|
<height>531</height>
|
|
</rect>
|
|
</property>
|
|
<property name="windowTitle">
|
|
<string>Form</string>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout">
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
<item>
|
|
<widget class="QLabel" name="label_4">
|
|
<property name="text">
|
|
<string>Type :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QComboBox" name="m_type_cb"/>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<widget class="QGroupBox" name="m_display_gb">
|
|
<property name="title">
|
|
<string>Représentation:</string>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
<item>
|
|
<widget class="QLabel" name="label_3">
|
|
<property name="text">
|
|
<string>Positionner :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QComboBox" name="m_snap_to_cb"/>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
|
<item>
|
|
<widget class="QLabel" name="label_9">
|
|
<property name="text">
|
|
<string>XRef Vertical Offset:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QSpinBox" name="m_offset_sb">
|
|
<property name="toolTip">
|
|
<string>10px corresponds to 1 tile displacement</string>
|
|
</property>
|
|
<property name="whatsThis">
|
|
<string>Set Vertical Offset for the Cross References. 10px corresponds to 1 tile displacement.</string>
|
|
</property>
|
|
<property name="specialValueText">
|
|
<string>Default - Fit to XRef height</string>
|
|
</property>
|
|
<property name="correctionMode">
|
|
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
|
|
</property>
|
|
<property name="suffix">
|
|
<string notr="true">px</string>
|
|
</property>
|
|
<property name="minimum">
|
|
<number>40</number>
|
|
</property>
|
|
<property name="maximum">
|
|
<number>300</number>
|
|
</property>
|
|
<property name="singleStep">
|
|
<number>10</number>
|
|
</property>
|
|
<property name="value">
|
|
<number>40</number>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<widget class="QCheckBox" name="m_stack_overlapping_cb">
|
|
<property name="toolTip">
|
|
<string>Quand les textes de deux références croisées se chevauchent, celle de l'élément le plus haut est placée au-dessus de l'autre.</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Empiler les références dont les textes se chevauchent</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
|
<item>
|
|
<widget class="QLabel" name="label_10">
|
|
<property name="text">
|
|
<string>XRef slave position</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QComboBox" name="m_xrefpos_cb"/>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
|
<item>
|
|
<widget class="QLabel" name="label_11">
|
|
<property name="text">
|
|
<string>Distance label - slave :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QSpinBox" name="m_slave_offset_sb">
|
|
<property name="toolTip">
|
|
<string>Distance in pixels between the label and the slave cross reference</string>
|
|
</property>
|
|
<property name="suffix">
|
|
<string notr="true">px</string>
|
|
</property>
|
|
<property name="correctionMode">
|
|
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
|
|
</property>
|
|
<property name="minimum">
|
|
<number>-50</number>
|
|
</property>
|
|
<property name="maximum">
|
|
<number>100</number>
|
|
</property>
|
|
<property name="singleStep">
|
|
<number>1</number>
|
|
</property>
|
|
<property name="value">
|
|
<number>0</number>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
<item>
|
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
<item>
|
|
<widget class="QCheckBox" name="m_show_terminal_name_cb">
|
|
<property name="text">
|
|
<string>Afficher les numéros de bornes dans les Xrefs</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QCheckBox" name="m_show_all_slaves_cb">
|
|
<property name="toolTip">
|
|
<string>Afficher dans le peigne de contacts tous les contacts esclaves définis par le maître, même ceux qui ne sont pas encore reliés, dans l'ordre défini par le maître</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Afficher tous les esclaves définis par le maître</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QRadioButton" name="m_display_has_contacts_rb">
|
|
<property name="text">
|
|
<string>Affiche&r en contacts</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QRadioButton" name="m_display_has_cross_rb">
|
|
<property name="text">
|
|
<string>Afficher en croix</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QVBoxLayout" name="verticalLayout_5">
|
|
<item>
|
|
<widget class="QGroupBox" name="m_labels_gb">
|
|
<property name="title">
|
|
<string>Label des références croisées</string>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_7">
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
|
<item>
|
|
<widget class="QLabel" name="label_6">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="minimumSize">
|
|
<size>
|
|
<width>48</width>
|
|
<height>0</height>
|
|
</size>
|
|
</property>
|
|
<property name="text">
|
|
<string>Maitre</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QLineEdit" name="m_master_le">
|
|
<property name="inputMask">
|
|
<string/>
|
|
</property>
|
|
<property name="text">
|
|
<string>%f-%l%c</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="m_font_pb">
|
|
<property name="toolTip">
|
|
<string>Choisir la police et la taille du texte du querverweis du câble</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Police…</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="m_slave_row">
|
|
<item>
|
|
<widget class="QLabel" name="label_7">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="minimumSize">
|
|
<size>
|
|
<width>48</width>
|
|
<height>0</height>
|
|
</size>
|
|
</property>
|
|
<property name="text">
|
|
<string>Esclave</string>
|
|
</property>
|
|
<property name="scaledContents">
|
|
<bool>false</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QLineEdit" name="m_slave_le">
|
|
<property name="text">
|
|
<string>(%f-%l%c)</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<widget class="QLabel" name="label_8">
|
|
<property name="text">
|
|
<string>Créer votre propre texte en vous aidant des variables suivantes :
|
|
%f : le numéro de folio
|
|
%F: le label de folio
|
|
%l : le numéro de ligne
|
|
%c : le numéro de colonne
|
|
%M: Installation
|
|
%LM: Localisation </string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<widget class="QGroupBox" name="m_cross_properties_gb">
|
|
<property name="title">
|
|
<string>Option d'affichage en croix</string>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_4">
|
|
<item>
|
|
<widget class="QCheckBox" name="m_show_power_cb">
|
|
<property name="text">
|
|
<string>Afficher les contacts de puissance dans la croix</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
<item row="0" column="0">
|
|
<widget class="QLabel" name="label">
|
|
<property name="text">
|
|
<string>Préfixe des contacts de puissance :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0">
|
|
<widget class="QLabel" name="label_2">
|
|
<property name="text">
|
|
<string>Préfixe des contacts temporisés :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="1">
|
|
<widget class="QLineEdit" name="m_delay_prefix_le"/>
|
|
</item>
|
|
<item row="0" column="1">
|
|
<widget class="QLineEdit" name="m_power_prefix_le"/>
|
|
</item>
|
|
<item row="2" column="0">
|
|
<widget class="QLabel" name="label_5">
|
|
<property name="text">
|
|
<string>Préfixe des contacts inverseurs :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="2" column="1">
|
|
<widget class="QLineEdit" name="m_switch_prefix_le"/>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<tabstops>
|
|
<tabstop>m_type_cb</tabstop>
|
|
<tabstop>m_snap_to_cb</tabstop>
|
|
<tabstop>m_offset_sb</tabstop>
|
|
<tabstop>m_stack_overlapping_cb</tabstop>
|
|
<tabstop>m_xrefpos_cb</tabstop>
|
|
<tabstop>m_display_has_contacts_rb</tabstop>
|
|
<tabstop>m_display_has_cross_rb</tabstop>
|
|
<tabstop>m_master_le</tabstop>
|
|
<tabstop>m_slave_le</tabstop>
|
|
<tabstop>m_show_power_cb</tabstop>
|
|
<tabstop>m_show_terminal_name_cb</tabstop>
|
|
<tabstop>m_show_all_slaves_cb</tabstop>
|
|
<tabstop>m_power_prefix_le</tabstop>
|
|
<tabstop>m_delay_prefix_le</tabstop>
|
|
<tabstop>m_switch_prefix_le</tabstop>
|
|
</tabstops>
|
|
<resources/>
|
|
<connections/>
|
|
</ui>
|