mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 22:54:12 +02:00
Kellermorph
69eb071f45
Upstream moved 56 commits ahead of the last merge. Six files conflicted,
all of them files where upstream's French -> English tr() translation wave
touched lines we had also touched with the cable feature. Resolution rule
applied everywhere: take upstream's English source strings, keep our cable
additions.
Resolved:
- sources/ui/xrefpropertieswidget.ui : kept our structure (m_labels_gb
pulled out of the display group, m_slave_row, the m_font_pb "Police..."
button of the cable cross-reference) and mechanically applied upstream's
20 English string replacements on top of it.
- sources/ui/xrefpropertieswidget.cpp : our version plus upstream's 7
translated combo entries; the tr("Cable") item we add for the cable
cross-reference type stays.
- sources/autoNum/ui/numparteditorw.cpp : upstream's English part names
("number format 1", "Sheet no.", "Plant", "Location", ...) for the
number-format list, with our comment explaining why type 3 (cable) takes
the conductor kinds of variable.
- sources/ui/configpage/configpages.cpp : upstream's English tab titles
(Conductors / Elements / Sheets) plus our Cables tab.
- sources/ui/configpage/projectconfigpages.cpp : upstream's "Sheets" tab
title plus our Cables tab block (single-rule SelectAutonumW(3)).
- sources/qetdiagrameditor.cpp : union of both sides - upstream's new
"Add a generic device" action (icon, status tip, data id) and its
English menu names ("File"/"Edit"/"Project"/"Display"), together with our
cable action, the Numbering and Lists menus, the cable list actions and
the CSV export in the Project menu.
Kept French: our own cable tr() source strings stay French for now. That
is the smaller change and the translation pass can follow separately.
Verified: full build 1065/1065, ctest 91/92 (only the pre-existing
headless tst_menubarkeyboard fails: no window manager, so Alt+F and F10
cannot open a menu bar), smoke start exit 124, no conflict marker left in
the tree.
369 lines
11 KiB
XML
369 lines
11 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>Properties cross references</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>Representation:</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>Positioning :</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>When the texts of two cross-references overlap, the one of the higher element is placed above the other.</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Stack references whose texts overlap</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>Display terminal numbers in Xrefs</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QCheckBox" name="m_show_all_slaves_cb">
|
|
<property name="toolTip">
|
|
<string>Show in the contact comb all slave contacts defined by the master, even those not yet connected, in the order defined by the master</string>
|
|
</property>
|
|
<property name="text">
|
|
<string>Show all slaves defined by the master</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QRadioButton" name="m_display_has_contacts_rb">
|
|
<property name="text">
|
|
<string>&View contacts</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QRadioButton" name="m_display_has_cross_rb">
|
|
<property name="text">
|
|
<string>View cross</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 cross reference</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>Master</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>Slave</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>Create your own text using the following variables:
|
|
%f: the sheet number
|
|
%F: the sheet label
|
|
%l: the row number
|
|
%c: the column number
|
|
%M: the installation
|
|
%LM: the location</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
<widget class="QGroupBox" name="m_cross_properties_gb">
|
|
<property name="title">
|
|
<string>Option display cross</string>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_4">
|
|
<item>
|
|
<widget class="QCheckBox" name="m_show_power_cb">
|
|
<property name="text">
|
|
<string>Show the power contacts in the cross</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
<item row="0" column="0">
|
|
<widget class="QLabel" name="label">
|
|
<property name="text">
|
|
<string>Prefix of power contacts :</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="1" column="0">
|
|
<widget class="QLabel" name="label_2">
|
|
<property name="text">
|
|
<string>Prefix delayed contacts :</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>Prefix changeover contacts :</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>
|