Added Cross Reference Labels for Master and Slave Element. Removed View Mode

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4511 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-05-23 22:01:22 +00:00
parent 7229109ff4
commit ada71484e8
8 changed files with 122 additions and 70 deletions

View File

@@ -110,8 +110,6 @@ void XRefPropertiesWidget::saveProperties(int index) {
if (ui->m_display_has_cross_rb->isChecked()) xrp.setDisplayHas(XRefProperties::Cross);
else if (ui->m_display_has_contacts_rb->isChecked()) xrp.setDisplayHas(XRefProperties::Contacts);
if (ui->m_display_folio_index_rb->isChecked()) xrp.setViewMode (XRefProperties::Index);
else if (ui->m_display_folio_label_rb->isChecked()) xrp.setViewMode (XRefProperties::FolioLabel);
if (ui->m_snap_to_cb->itemData(ui->m_snap_to_cb->currentIndex()).toString() == "bottom")
xrp.setSnapTo(XRefProperties::Bottom);
else xrp.setSnapTo(XRefProperties::Label);
@@ -119,6 +117,8 @@ void XRefPropertiesWidget::saveProperties(int index) {
xrp.setPrefix("power", ui->m_power_prefix_le->text());
xrp.setPrefix("delay", ui->m_delay_prefix_le->text());
xrp.setPrefix("switch", ui->m_switch_prefix_le->text());
xrp.setMasterLabel(ui->m_master_le->text());
xrp.setSlaveLabel(ui->m_slave_le->text());
m_properties.insert(type, xrp);
}
@@ -139,13 +139,11 @@ void XRefPropertiesWidget::updateDisplay() {
ui->m_display_has_contacts_rb->setChecked(true);
}
XRefProperties::ViewMode vw = xrp.viewMode();
if (vw == XRefProperties::Index) {
ui->m_display_folio_index_rb->setChecked(true);
}
else if (vw == XRefProperties::FolioLabel) {
ui->m_display_folio_label_rb->setChecked(true);
}
QString master = xrp.masterLabel();
ui->m_master_le->setText(master);
QString slave = xrp.slaveLabel();
ui->m_slave_le->setText(slave);
if (xrp.snapTo() == XRefProperties::Bottom)
ui->m_snap_to_cb->setCurrentIndex(ui->m_snap_to_cb->findData("bottom"));

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>484</width>
<height>475</height>
<height>649</height>
</rect>
</property>
<property name="windowTitle">
@@ -75,26 +75,84 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Mode d'affichage</string>
<string>Cross Reference Labels</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QRadioButton" name="m_display_folio_label_rb">
<property name="text">
<string> Label de Folio</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
<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>
</layout>
</item>
<item>
<widget class="QRadioButton" name="m_display_folio_index_rb">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<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>Index de Folio </string>
</property>
<property name="autoExclusive">
<bool>true</bool>
<string>You can use variables for the displayed label of XRef:
The variables are:
%f: Folio Index
%F: Folio label
%l: Line
%c: Colunm</string>
</property>
</widget>
</item>