kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Conductor properties widget : minor change

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4164 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-08-26 21:46:47 +00:00
parent fd8382d842
commit 94c3526d2f
4 changed files with 327 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/ui/conductorpropertiesdialog.cpp
View File

@@ -40,7 +40,7 @@ ConductorPropertiesDialog::ConductorPropertiesDialog(Conductor *conductor, QWidg
conductor -> relatedPotentialConductors().size()) {
m_cpw->setDisabledShowText();
}
ui -> main_layout -> insertWidget(1, m_cpw);
ui -> main_layout -> insertWidget(0, m_cpw);
}
/**

17
sources/ui/conductorpropertiesdialog.ui
View File

@@ -6,27 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>430</width>
<height>300</height>
<width>485</width>
<height>66</height>
</rect>
</property>
<property name="windowTitle">
<string>Éditer les propriétés d'un conducteur</string>
</property>
<layout class="QVBoxLayout" name="main_layout">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="m_apply_all_cb">
<property name="text">

18
sources/ui/conductorpropertieswidget.cpp
View File

@@ -97,8 +97,8 @@ void ConductorPropertiesWidget::setProperties(const ConductorProperties &propert
*/
ConductorProperties ConductorPropertiesWidget::properties() const {
ConductorProperties properties_;
if (ui -> m_multi_rb -> isChecked()) properties_.type = ConductorProperties::Multi;
else if (ui -> m_single_rb -> isChecked()) properties_.type = ConductorProperties::Single;
if (ui -> m_multiwires_gb -> isChecked()) properties_.type = ConductorProperties::Multi;
else if (ui -> m_singlewire_gb -> isChecked()) properties_.type = ConductorProperties::Single;
properties_.color = ui -> m_color_pb->palette().color(QPalette::Button);
properties_.style = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style();
@@ -177,9 +177,11 @@ void ConductorPropertiesWidget::initWidget() {
ui -> m_line_style_cb -> addItem(tr("Traits et points", "conductor style: dashed and dotted line"), QPen(Qt::DashDotLine));
ui -> m_update_preview_pb -> setHidden(true);
//Check this checkbox for init the associated groupbox
ui -> m_single_rb -> setChecked(true);
ui -> m_multi_rb -> setChecked(true);
connect(ui->m_multiwires_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_singlewire_gb->setChecked(!toggle);});
connect(ui->m_singlewire_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_multiwires_gb->setChecked(!toggle);});
ui->m_multiwires_gb->setChecked(true);
ui->m_singlewire_gb->setChecked(true);
}
/**
@@ -190,13 +192,13 @@ void ConductorPropertiesWidget::initWidget() {
void ConductorPropertiesWidget::setConductorType(ConductorProperties::ConductorType type) {
switch (type) {
case ConductorProperties::Multi:
ui -> m_multi_rb -> setChecked(true);
ui -> m_multiwires_gb -> setChecked(true);
break;
case ConductorProperties::Single:
ui -> m_single_rb -> setChecked(true);
ui -> m_singlewire_gb -> setChecked(true);
break;
default:
ui -> m_multi_rb -> setChecked(true);
ui -> m_multiwires_gb -> setChecked(true);
break;
}
}

237
sources/ui/conductorpropertieswidget.ui
View File

@@ -6,72 +6,46 @@
<rect>
<x>0</x>
<y>0</y>
<width>633</width>
<height>470</height>
<width>354</width>
<height>329</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="m_type_gb">
<property name="title">
<string>Type de conducteur</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="m_multi_rb">
<property name="toolTip">
<string>Multifilaire</string>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<property name="text">
<string>Multifilaire</string>
</property>
</widget>
</item>
<widget class="QWidget" name="type">
<attribute name="title">
<string>Type</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QGroupBox" name="m_multi_gb">
<widget class="QGroupBox" name="m_multiwires_gb">
<property name="title">
<string/>
<string>Multifilaire</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Texte :</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="m_text_le">
<property name="toolTip">
<string>Texte</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Taille :</string>
</property>
</widget>
</item>
<item>
<item row="0" column="3">
<widget class="QSpinBox" name="m_text_size_sb">
<property name="toolTip">
<string>Taille du texte</string>
@@ -84,7 +58,24 @@
</property>
</widget>
</item>
<item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Taille :</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_text_le">
<property name="toolTip">
<string>Texte</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QCheckBox" name="m_show_text_cb">
<property name="toolTip">
<string>Texte visible</string>
@@ -113,19 +104,9 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Rotation du texte de conducteur :</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="m_text_angle_gl">
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Vertical</string>
@@ -135,7 +116,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Horizontal</string>
@@ -145,42 +126,36 @@
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QRadioButton" name="m_single_rb">
<property name="toolTip">
<string>Unifilaire</string>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Unifilaire</string>
<string>Rotation du texte de conducteur :</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_single_gb">
<widget class="QGroupBox" name="m_singlewire_gb">
<property name="title">
<string/>
<string>Unifilaire</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
<property name="flat">
<bool>false</bool>
</property>
<property name="leftMargin">
<number>9</number>
<property name="checkable">
<bool>true</bool>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
@@ -294,21 +269,12 @@
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Apparence du conducteur</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="2">
<widget class="QComboBox" name="m_line_style_cb">
<property name="toolTip">
<string>Style du conducteur</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="appearance">
<attribute name="title">
<string>Apparence</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>Couleur du conducteur</string>
@@ -318,7 +284,24 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string>Style du conducteur</string>
</property>
<property name="text">
<string>Style :</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="m_line_style_cb">
<property name="toolTip">
<string>Style du conducteur</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="m_color_pb">
<property name="toolTip">
<string>Couleur du conducteur</string>
@@ -337,18 +320,22 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string>Style du conducteur</string>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="text">
<string>Style :</string>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
@@ -356,22 +343,6 @@
<include location="../../qelectrotech.qrc"/>
</resources>
<connections>
<connection>
<sender>m_multi_rb</sender>
<signal>toggled(bool)</signal>
<receiver>m_multi_gb</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>88</x>
<y>73</y>
</hint>
<hint type="destinationlabel">
<x>54</x>
<y>99</y>
</hint>
</hints>
</connection>
<connection>
<sender>m_phase_slider</sender>
<signal>valueChanged(int)</signal>
@@ -404,22 +375,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>m_single_rb</sender>
<signal>toggled(bool)</signal>
<receiver>m_single_gb</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>78</x>
<y>192</y>
</hint>
<hint type="destinationlabel">
<x>81</x>
<y>250</y>
</hint>
</hints>
</connection>
<connection>
<sender>m_phase_cb</sender>
<signal>toggled(bool)</signal>