| [qet] qet/qet: [4920] Improve some layout and widget item |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4920
Author: blacksun
Date: 2017-02-26 19:30:34 +0100 (Sun, 26 Feb 2017)
Log Message:
-----------
Improve some layout and widget item
Modified Paths:
--------------
trunk/sources/autoNum/ui/autonumberingmanagementw.ui
trunk/sources/autoNum/ui/folioautonumbering.ui
trunk/sources/autoNum/ui/formulaautonumberingw.ui
trunk/sources/autoNum/ui/numparteditorw.cpp
trunk/sources/autoNum/ui/numparteditorw.h
trunk/sources/autoNum/ui/selectautonumw.cpp
trunk/sources/autoNum/ui/selectautonumw.h
trunk/sources/autoNum/ui/selectautonumw.ui
trunk/sources/projectconfigpages.cpp
trunk/sources/projectconfigpages.h
trunk/sources/qetdiagrameditor.cpp
Removed Paths:
-------------
trunk/sources/autoNum/ui/dialogautonum.cpp
trunk/sources/autoNum/ui/dialogautonum.h
trunk/sources/autoNum/ui/dialogautonum.ui
Modified: trunk/sources/autoNum/ui/autonumberingmanagementw.ui
===================================================================
--- trunk/sources/autoNum/ui/autonumberingmanagementw.ui 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/autonumberingmanagementw.ui 2017-02-26 18:30:34 UTC (rev 4920)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>650</width>
- <height>550</height>
+ <width>460</width>
+ <height>508</height>
</rect>
</property>
<property name="sizePolicy">
@@ -25,444 +25,410 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <item>
- <widget class="QScrollArea" name="scrollArea">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="2" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Range</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="2" column="0">
+ <widget class="QLineEdit" name="m_selected_folios_le">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QRadioButton" name="m_apply_locations_rb">
+ <property name="text">
+ <string>Apply to Selected Locations</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="m_apply_folios_rb">
+ <property name="text">
+ <string>Apply to Selected Folios</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="m_apply_project_rb">
+ <property name="text">
+ <string>Apply to Entire Project</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLineEdit" name="m_selected_locations_le"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QWidget" name="m_selected_folios_widget" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>From</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="m_from_folios_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>To</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="m_to_folios_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
- <verstretch>50</verstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
- <size>
- <width>450</width>
- <height>253</height>
- </size>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Help</set>
</property>
- <property name="sizeIncrement">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="mouseTracking">
- <bool>false</bool>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
+ <property name="text">
+ <string>Project Status:</string>
</property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Update Policy</string>
</property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QAbstractScrollArea::AdjustToContents</enum>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>630</width>
- <height>495</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>430</width>
- <height>250</height>
- </size>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetFixedSize</enum>
- </property>
- <item row="0" column="1">
- <widget class="QLabel" name="label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Project Status:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QComboBox" name="m_status_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContents</enum>
- </property>
- </widget>
- </item>
- <item row="5" column="1" colspan="3">
- <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 row="3" column="1" colspan="3">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Range</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="2" column="0">
- <widget class="QLineEdit" name="m_selected_folios_le">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QRadioButton" name="m_apply_locations_rb">
- <property name="text">
- <string>Apply to Selected Locations</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="m_apply_folios_rb">
- <property name="text">
- <string>Apply to Selected Folios</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QRadioButton" name="m_apply_project_rb">
- <property name="text">
- <string>Apply to Entire Project</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLineEdit" name="m_selected_locations_le"/>
- </item>
- <item row="5" column="0">
- <widget class="QWidget" name="m_selected_folios_widget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>From</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="m_from_folios_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>To</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="m_to_folios_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" colspan="4">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Update Policy</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QWidget" name="conductorWidget" native="true">
- <layout class="QHBoxLayout" name="conductor_hl">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Conductor</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_both_conductor_rb">
- <property name="text">
- <string>Both</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_new_conductor_rb">
- <property name="text">
- <string>Only New</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_existent_conductor_rb">
- <property name="text">
- <string>Only Existent</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_disable_conductor_rb">
- <property name="text">
- <string>Disable</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="elementWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QHBoxLayout" name="element_hl">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Element</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_both_element_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Both</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_new_element_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Only New</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_existent_element_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Only Existent</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_disable_element_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Disable</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="folioWidget" native="true">
- <property name="font">
- <font>
- <weight>50</weight>
- <bold>false</bold>
- <kerning>true</kerning>
- </font>
- </property>
- <layout class="QHBoxLayout" name="folio_hl">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Folio</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_new_folio_rb">
- <property name="text">
- <string>Only New</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_existent_folio_rb">
- <property name="text">
- <string>Existent</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_both_folio_rb">
- <property name="text">
- <string>Both</string>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_disable_folio_rb">
- <property name="text">
- <string>Disable</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QWidget" name="conductorWidget" native="true">
+ <layout class="QHBoxLayout" name="conductor_hl">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Conductor</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_both_conductor_rb">
+ <property name="text">
+ <string>Both</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_new_conductor_rb">
+ <property name="text">
+ <string>Only New</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_existent_conductor_rb">
+ <property name="text">
+ <string>Only Existent</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_disable_conductor_rb">
+ <property name="text">
+ <string>Disable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="elementWidget" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QHBoxLayout" name="element_hl">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Element</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_both_element_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Both</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_new_element_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Only New</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_existent_element_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Only Existent</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_disable_element_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Disable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="folioWidget" native="true">
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ <kerning>true</kerning>
+ </font>
+ </property>
+ <layout class="QHBoxLayout" name="folio_hl">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Folio</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_new_folio_rb">
+ <property name="text">
+ <string>Only New</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_existent_folio_rb">
+ <property name="text">
+ <string>Existent</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_both_folio_rb">
+ <property name="text">
+ <string>Both</string>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_disable_folio_rb">
+ <property name="text">
+ <string>Disable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
+ <item row="0" column="1">
+ <widget class="QComboBox" name="m_status_cb">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Apply|QDialogButtonBox::Help</set>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <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>
</layout>
</widget>
<resources/>
Deleted: trunk/sources/autoNum/ui/dialogautonum.cpp
===================================================================
--- trunk/sources/autoNum/ui/dialogautonum.cpp 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/dialogautonum.cpp 2017-02-26 18:30:34 UTC (rev 4920)
@@ -1,113 +0,0 @@
-/*
- Copyright 2006-2017 The QElectroTech Team
- This file is part of QElectroTech.
-
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "dialogautonum.h"
-#include "ui_dialogautonum.h"
-
-//#include "conductorautonumerotation.h"
-#include "qetmessagebox.h"
-#include "ui/selectautonumw.h"
-
-/**
- * @brief DialogAutoNum::DialogAutoNum
- * @param dg
- * @param parent
- */
-DialogAutoNum::DialogAutoNum(Diagram *dg, QWidget *parent) :
- QDialog(parent),
- ui(new Ui::DialogAutoNum),
- dg_ (dg)
-{
- ui -> setupUi(this);
-
- ui -> configuration_layout -> addWidget (new SelectAutonumW());
-
- dgselect_ = new diagramselection( dg_ -> project(), ui -> annotation_tab);
- ui -> verticalLayout_Selection -> addWidget(dgselect_);
-}
-
-/**
- * @brief Destructor
- */
-DialogAutoNum::~DialogAutoNum(){
- delete ui;
-}
-
-/**
- * @brief DialogAutoNum::on_pushButton_delete_clicked
- */
-void DialogAutoNum::on_pushButton_delete_clicked() {
- // get list of diagrams selected
- QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
- if(listDiag.count()<=0) return;
-
- QString diagramsTitle;
- for(int i=0; i<listDiag.count(); i++){
- diagramsTitle += listDiag.at(i) -> title();
- if(i+1 < listDiag.count()) diagramsTitle += ", ";
- }
- // Ask if user is sure to delete the conductor numerotation
- QMessageBox::StandardButton answer = QET::QetMessageBox::critical(
- this,
- tr("Suppression des annotations conducteurs", "Attention"),
- QString(
- tr("Voulez-vous vraiment supprimer les annotations conducteurs de :\n\n%1 ?")
- ).arg(diagramsTitle),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No
- );
-
- // if yes remove all
- if( answer == QMessageBox::Yes) {
- for(int i=0; i<listDiag.count(); i++){
- /*ConductorAutoNumerotation can(listDiag.at(i));
- can.removeNumOfDiagram();*/
- }
- }
-}
-
-/**
- * @brief set the autonum to all diagram selected
- */
-void DialogAutoNum::on_pushButton_annotation_clicked(){
- // Get list of diagrams selected
- QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
- if(listDiag.count()<=0) return;
-
- QString diagramsTitle;
- for(int i=0; i<listDiag.count(); i++){
- diagramsTitle += listDiag.at(i) -> title();
- if(i+1 < listDiag.count()) diagramsTitle += ", ";
- }
- // Ask if user is sure to numerate the conductor
- QET::QetMessageBox::warning(
- this,
- tr("Annotation des conducteurs", "Attention"),
- QString(
- tr("Voulez-vous vraiment annoter les conducteurs de :\n\n%1 ?")
- ).arg(diagramsTitle),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No
- );
-}
-
-/**
- * @brief Close the dialog
- */
-void DialogAutoNum::on_pushButton_close_clicked() {
- close();
-}
Deleted: trunk/sources/autoNum/ui/dialogautonum.h
===================================================================
--- trunk/sources/autoNum/ui/dialogautonum.h 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/dialogautonum.h 2017-02-26 18:30:34 UTC (rev 4920)
@@ -1,49 +0,0 @@
-/*
- Copyright 2006-2017 The QElectroTech Team
- This file is part of QElectroTech.
-
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef DIALOGAUTONUM_H
-#define DIALOGAUTONUM_H
-
-#include <QDialog>
-
-#include "diagram.h"
-#include "ui/diagramselection.h"
-
-namespace Ui {
- class DialogAutoNum;
-}
-
-class DialogAutoNum : public QDialog
-{
- Q_OBJECT
-
- public:
- explicit DialogAutoNum(Diagram *dg, QWidget *parent = 0);
- ~DialogAutoNum();
-
- private slots:
- void on_pushButton_annotation_clicked();
- void on_pushButton_delete_clicked();
- void on_pushButton_close_clicked();
-
- private:
- Ui::DialogAutoNum *ui;
- Diagram *dg_;
- diagramselection *dgselect_;
-};
-
-#endif // DialogAutoNum_H
Deleted: trunk/sources/autoNum/ui/dialogautonum.ui
===================================================================
--- trunk/sources/autoNum/ui/dialogautonum.ui 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/dialogautonum.ui 2017-02-26 18:30:34 UTC (rev 4920)
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DialogAutoNum</class>
- <widget class="QDialog" name="DialogAutoNum">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>482</width>
- <height>416</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Annotation des schémas</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</iconset>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="configuration_tab">
- <attribute name="title">
- <string>Configuration</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <layout class="QVBoxLayout" name="configuration_layout">
- <property name="spacing">
- <number>0</number>
- </property>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="annotation_tab">
- <attribute name="title">
- <string>Annotation</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QGroupBox" name="groupBox_Selection">
- <property name="title">
- <string>Sélection</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_">
- <item>
- <widget class="QRadioButton" name="radioButton_conductor">
- <property name="text">
- <string>Conducteurs</string>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/22x22/conductor2.png</normaloff>:/ico/22x22/conductor2.png</iconset>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioButton_component">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Composants</string>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/22x22/single_page.png</normaloff>:/ico/22x22/single_page.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_Selection"/>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="pushButton_annotation">
- <property name="toolTip">
- <string><html><head/><body><p>Numérotée les folio sélectionné</p></body></html></string>
- </property>
- <property name="text">
- <string>Annotation (alpha)</string>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/16x16/edit-select-all.png</normaloff>:/ico/16x16/edit-select-all.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_delete">
- <property name="toolTip">
- <string><html><head/><body><p>Supprimé la numérotation des folio sélectionné</p></body></html></string>
- </property>
- <property name="text">
- <string>Supprimer l'annotation</string>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/16x16/edit-delete.png</normaloff>:/ico/16x16/edit-delete.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_close">
- <property name="text">
- <string>Fermer</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources>
- <include location="../../qelectrotech.qrc"/>
- </resources>
- <connections/>
-</ui>
Modified: trunk/sources/autoNum/ui/folioautonumbering.ui
===================================================================
--- trunk/sources/autoNum/ui/folioautonumbering.ui 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/folioautonumbering.ui 2017-02-26 18:30:34 UTC (rev 4920)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>524</width>
- <height>550</height>
+ <width>460</width>
+ <height>309</height>
</rect>
</property>
<property name="sizePolicy">
@@ -26,254 +26,185 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
<item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>50</verstretch>
- </sizepolicy>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Numérotation automatique de Folio :</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="m_autonums_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QGroupBox" name="Select">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Sélection:</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QRadioButton" name="m_create_new_tabs_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Créer de nouveaux Folios</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="m_autonumber_tabs_rb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>NumAuto des folios séléctionnés</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QGroupBox" name="Options">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string> Options de numérotation</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="2" column="1">
+ <widget class="QComboBox" name="m_to_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Nouveaux Folios</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="m_from_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="m_new_tabs_sb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ <property name="displayIntegerBase">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>À</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>De</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="minimumSize">
+ <property name="sizeHint" stdset="0">
<size>
- <width>450</width>
- <height>253</height>
+ <width>20</width>
+ <height>40</height>
</size>
</property>
- <property name="sizeIncrement">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- <property name="mouseTracking">
- <bool>false</bool>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QAbstractScrollArea::AdjustToContents</enum>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>504</width>
- <height>495</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>430</width>
- <height>250</height>
- </size>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetFixedSize</enum>
- </property>
- <item row="2" column="1" colspan="2">
- <widget class="QGroupBox" name="Options">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string> Options de numérotation</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="2" column="1">
- <widget class="QComboBox" name="m_to_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContents</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Nouveaux Folios</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="m_from_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContents</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="m_new_tabs_sb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- <property name="displayIntegerBase">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>À</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>De</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QGroupBox" name="Select">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Sélection:</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QRadioButton" name="m_create_new_tabs_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Créer de nouveaux Folios</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="m_autonumber_tabs_rb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>NumAuto des folios séléctionnés</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Numérotation automatique de Folio :</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QComboBox" name="m_autonums_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContents</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <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>
- </layout>
- </widget>
- </widget>
+ </spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
@@ -289,6 +220,10 @@
</widget>
</item>
</layout>
+ <zorder>buttonBox</zorder>
+ <zorder>verticalSpacer</zorder>
+ <zorder>gridLayoutWidget</zorder>
+ <zorder>verticalSpacer</zorder>
</widget>
<resources/>
<connections/>
Modified: trunk/sources/autoNum/ui/formulaautonumberingw.ui
===================================================================
--- trunk/sources/autoNum/ui/formulaautonumberingw.ui 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/formulaautonumberingw.ui 2017-02-26 18:30:34 UTC (rev 4920)
@@ -40,8 +40,21 @@
<property name="title">
<string>Auto Naming Pattern:</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Formula:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLineEdit" name="m_formula_le">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -60,18 +73,18 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text">
- <string>Formula:</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
Modified: trunk/sources/autoNum/ui/numparteditorw.cpp
===================================================================
--- trunk/sources/autoNum/ui/numparteditorw.cpp 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/numparteditorw.cpp 2017-02-26 18:30:34 UTC (rev 4920)
@@ -22,10 +22,11 @@
/**
* Constructor
*/
-NumPartEditorW::NumPartEditorW(QWidget *parent) :
+NumPartEditorW::NumPartEditorW(int type, QWidget *parent) :
QWidget(parent),
ui(new Ui::NumPartEditorW),
- intValidator (new QIntValidator(0,99999,this))
+ intValidator (new QIntValidator(0,99999,this)),
+ m_edited_type(type)
{
ui -> setupUi(this);
setVisibleItems();
@@ -36,10 +37,11 @@
* Constructor
* Build with value of @context at position i
*/
-NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, QWidget *parent):
+NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, int type, QWidget *parent):
QWidget(parent),
ui(new Ui::NumPartEditorW),
- intValidator (new QIntValidator(0,99999,this))
+ intValidator (new QIntValidator(0,99999,this)),
+ m_edited_type(type)
{
ui -> setupUi(this);
setVisibleItems();
@@ -75,15 +77,18 @@
delete ui;
}
-void NumPartEditorW::setVisibleItems() {
+void NumPartEditorW::setVisibleItems()
+{
ui->type_cb->setInsertPolicy(QComboBox::InsertAtBottom);
QStringList items;
- if (parentWidget()->parentWidget()->objectName()=="FolioTab") {
+ if (m_edited_type == 2)
+ {
items << tr("Chiffre 1") << tr("Chiffre 01")
<< tr("Chiffre 001")
<< tr("Texte");
}
- else if (parentWidget()->parentWidget()->objectName()=="ConductorTab") {
+ else if (m_edited_type == 1)
+ {
items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01")
<< tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio")
<< tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach");
Modified: trunk/sources/autoNum/ui/numparteditorw.h
===================================================================
--- trunk/sources/autoNum/ui/numparteditorw.h 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/numparteditorw.h 2017-02-26 18:30:34 UTC (rev 4920)
@@ -35,37 +35,39 @@
{
Q_OBJECT
- //METHODS
+ //METHODS
public:
- explicit NumPartEditorW(QWidget *parent = 0);
- NumPartEditorW (NumerotationContext &, int, QWidget *parent=0);
- ~NumPartEditorW();
+ explicit NumPartEditorW(int type, QWidget *parent = 0);
+ NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=0);
+ ~NumPartEditorW();
- enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
- string,idfolio,folio,machine,locmach,
- elementline,elementcolumn,elementprefix,
- };
- NumerotationContext toNumContext();
- bool isValid ();
- type type_;
+ enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
+ string,idfolio,folio,machine,locmach,
+ elementline,elementcolumn,elementprefix,
+ };
+ NumerotationContext toNumContext();
+ bool isValid ();
+ type type_;
private:
- void setVisibleItems();
- void disableItem(int index);
- void setCurrentIndex(NumPartEditorW::type);
+ void setVisibleItems();
+ void disableItem(int index);
+ void setCurrentIndex(NumPartEditorW::type);
private slots:
- void on_type_cb_activated(int);
- void on_value_field_textEdited();
- void on_increase_spinBox_valueChanged(int);
- void setType (NumPartEditorW::type t, bool=false);
+ void on_type_cb_activated(int);
+ void on_value_field_textEdited();
+ void on_increase_spinBox_valueChanged(int);
+ void setType (NumPartEditorW::type t, bool=false);
signals:
- void changed ();
+ void changed ();
private:
- Ui::NumPartEditorW *ui;
- QValidator *intValidator;
+ Ui::NumPartEditorW *ui;
+ QValidator *intValidator;
+ int m_edited_type = -1; //0 == element : 1 == conductor : 2 == folio
+
};
Modified: trunk/sources/autoNum/ui/selectautonumw.cpp
===================================================================
--- trunk/sources/autoNum/ui/selectautonumw.cpp 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/selectautonumw.cpp 2017-02-26 18:30:34 UTC (rev 4920)
@@ -27,36 +27,44 @@
/**
* Constructor
*/
-SelectAutonumW::SelectAutonumW(QWidget *parent) :
+SelectAutonumW::SelectAutonumW(int type, QWidget *parent) :
QWidget(parent),
- ui(new Ui::SelectAutonumW)
+ ui(new Ui::SelectAutonumW),
+ m_edited_type(type)
{
ui->setupUi(this);
- if (this->parentWidget() -> objectName()=="ElementTab"){
+ if (m_edited_type == 0)
+ {
m_feaw = new FormulaAutonumberingW();
- ui->scrollAreaWidgetContents->layout()->addWidget(m_feaw);
+ m_feaw->ui->label->setHidden(true);
+ ui->m_widget->layout()->addWidget(m_feaw);
}
- else if (this->parentWidget() -> objectName()=="ConductorTab"){
+ else if (m_edited_type == 1)
+ {
m_fcaw = new FormulaAutonumberingW();
m_fcaw->ui->label->setHidden(true);
- ui->scrollAreaWidgetContents->layout()->addWidget(m_fcaw);
+ ui->m_widget->layout()->addWidget(m_fcaw);
}
setContext(NumerotationContext());
}
-SelectAutonumW::SelectAutonumW(const NumerotationContext &context, QWidget *parent) :
+SelectAutonumW::SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent) :
QWidget(parent),
- ui(new Ui::SelectAutonumW)
+ ui(new Ui::SelectAutonumW),
+ m_edited_type(type)
{
- if (this->parentWidget() -> objectName()=="ElementTab"){
+ if (m_edited_type == 0)
+ {
m_feaw = new FormulaAutonumberingW();
- ui->scrollAreaWidgetContents->layout()->addWidget(m_feaw);
+ m_feaw->ui->label->setHidden(true);
+ ui->m_widget->layout()->addWidget(m_feaw);
}
- else if (this->parentWidget() -> objectName()=="ConductorTab"){
+ else if (m_edited_type == 1)
+ {
m_fcaw = new FormulaAutonumberingW();
m_fcaw->ui->label->setHidden(true);
- ui->scrollAreaWidgetContents->layout()->addWidget(m_fcaw);
+ ui->m_widget->layout()->addWidget(m_fcaw);
}
ui->setupUi(this);
setContext(context);
@@ -85,7 +93,7 @@
}
else {
for (int i=0; i<m_context.size(); ++i) { //build with the content of @context
- NumPartEditorW *part= new NumPartEditorW(m_context, i, this);
+ NumPartEditorW *part= new NumPartEditorW(m_context, i, m_edited_type, this);
connect (part, SIGNAL(changed()), this, SLOT(applyEnable()));
num_part_list_ << part;
ui -> editor_layout -> addWidget(part);
@@ -113,9 +121,10 @@
* @brief SelectAutonumW::on_add_button_clicked
* Action on add_button, add a @NumPartEditor
*/
-void SelectAutonumW::on_add_button_clicked() {
+void SelectAutonumW::on_add_button_clicked()
+{
applyEnable(false);
- NumPartEditorW *part = new NumPartEditorW(this);
+ NumPartEditorW *part = new NumPartEditorW(m_edited_type, this);
connect (part, SIGNAL(changed()), this, SLOT(applyEnable()));
num_part_list_ << part;
ui -> editor_layout -> addWidget(part);
@@ -143,12 +152,14 @@
* @brief SelectAutonumW::formula
* @return autonumbering widget formula
*/
-QString SelectAutonumW::formula() {
- if (this->parentWidget() -> objectName()=="ElementTab")
- return m_feaw->formula();
- else if (this->parentWidget() ->objectName()=="ConductorTab")
- return m_fcaw->formula();
- else return "";
+QString SelectAutonumW::formula()
+{
+ if (m_edited_type == 0)
+ return m_feaw->formula();
+ else if (m_edited_type == 1)
+ return m_fcaw->formula();
+ else
+ return "";
}
/**
@@ -165,7 +176,8 @@
break;
//help dialog
case QDialogButtonBox::HelpRole:
- if (this->parentWidget() -> objectName()=="FolioTab"){
+ if (m_edited_type == 2)
+ {
QMessageBox::information (this, tr("Folio Autonumérotation", "title window"),
tr("C'est ici que vous pouvez définir la manière dont sera numéroté les nouveaux folios.\n"
"-Une numérotation est composée d'une variable minimum.\n"
@@ -183,7 +195,8 @@
));
break;
}
- else{
+ else
+ {
QMessageBox::information (this, tr("Conducteur Autonumérotation", "title window"),
tr("C'est ici que vous pouvez définir la manière dont sera numéroté les nouveaux conducteurs.\n"
"-Une numérotation est composée d'une variable minimum.\n"
@@ -234,9 +247,9 @@
else {
ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(b);
}
- if (this->parentWidget() -> objectName()=="ElementTab")
+ if (m_edited_type == 0)
contextToFormula();
- if (this->parentWidget()->objectName()=="ConductorTab")
+ if (m_edited_type == 1)
contextToFormula();
}
@@ -247,9 +260,9 @@
void SelectAutonumW::contextToFormula()
{
FormulaAutonumberingW* m_faw = nullptr;
- if (this->parentWidget() -> objectName()=="ElementTab")
+ if (m_edited_type == 0)
m_faw = m_feaw;
- else if (this->parentWidget()->objectName()=="ConductorTab")
+ else if (m_edited_type == 1)
m_faw = m_fcaw;
if (m_faw)
Modified: trunk/sources/autoNum/ui/selectautonumw.h
===================================================================
--- trunk/sources/autoNum/ui/selectautonumw.h 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/selectautonumw.h 2017-02-26 18:30:34 UTC (rev 4920)
@@ -36,8 +36,8 @@
//METHODS
public:
- explicit SelectAutonumW(QWidget *parent = 0);
- explicit SelectAutonumW(const NumerotationContext &context, QWidget *parent = 0);
+ explicit SelectAutonumW(int type, QWidget *parent = 0);
+ explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = 0);
~SelectAutonumW();
void setContext (const NumerotationContext &context);
@@ -68,6 +68,7 @@
NumerotationContext m_context;
FormulaAutonumberingW *m_feaw;
FormulaAutonumberingW *m_fcaw;
+ int m_edited_type = -1; //0 == element : 1 == conductor : 2 == folio
};
#endif // SELECTAUTONUMW_H
Modified: trunk/sources/autoNum/ui/selectautonumw.ui
===================================================================
--- trunk/sources/autoNum/ui/selectautonumw.ui 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/autoNum/ui/selectautonumw.ui 2017-02-26 18:30:34 UTC (rev 4920)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>418</width>
- <height>508</height>
+ <width>616</width>
+ <height>421</height>
</rect>
</property>
<property name="sizePolicy">
@@ -21,267 +21,215 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>400</width>
- <height>455</height>
- </size>
- </property>
- <property name="sizeIncrement">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="mouseTracking">
- <bool>false</bool>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QAbstractScrollArea::AdjustToContents</enum>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>453</height>
- </rect>
+ <widget class="QWidget" name="m_widget" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <property name="minimumSize">
- <size>
- <width>400</width>
- <height>450</height>
- </size>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="sizeConstraint">
- <enum>QLayout::SetFixedSize</enum>
- </property>
- <item>
- <widget class="QGroupBox" name="definition_groupe">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="m_definition_groupe">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Définition</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- <property name="title">
- <string>Définition</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="sizeConstraint">
- <enum>QLayout::SetFixedSize</enum>
- </property>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="remove_button">
- <property name="toolTip">
- <string><html><head/><body><p>Supprimer une variable de numérotation</p></body></html></string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/22x22/list-remove.png</normaloff>:/ico/22x22/list-remove.png</iconset>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="add_button">
- <property name="toolTip">
- <string><html><head/><body><p>Ajouter une variable de numérotation</p></body></html></string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/22x22/list-add.png</normaloff>:/ico/22x22/list-add.png</iconset>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_previous_pb">
- <property name="toolTip">
- <string>Précédent</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/16x16/arrow-left.png</normaloff>:/ico/16x16/arrow-left.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_next_pb">
- <property name="toolTip">
- <string>Suivant</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/16x16/arrow-right.png</normaloff>:/ico/16x16/arrow-right.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="editor_layout" stretch="0">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <item>
- <layout class="QHBoxLayout" name="label_layout" stretch="0,0,0">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <item>
- <widget class="QLabel" name="type_label">
- <property name="text">
- <string>Type</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="value_label">
- <property name="text">
- <string>Valeur</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="increase_label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Incrémentation</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="remove_button">
+ <property name="toolTip">
+ <string><html><head/><body><p>Supprimer une variable de numérotation</p></body></html></string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../qelectrotech.qrc">
+ <normaloff>:/ico/22x22/list-remove.png</normaloff>:/ico/22x22/list-remove.png</iconset>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="add_button">
+ <property name="toolTip">
+ <string><html><head/><body><p>Ajouter une variable de numérotation</p></body></html></string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../qelectrotech.qrc">
+ <normaloff>:/ico/22x22/list-add.png</normaloff>:/ico/22x22/list-add.png</iconset>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="m_previous_pb">
+ <property name="toolTip">
+ <string>Précédent</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../qelectrotech.qrc">
+ <normaloff>:/ico/16x16/arrow-left.png</normaloff>:/ico/16x16/arrow-left.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="m_next_pb">
+ <property name="toolTip">
+ <string>Suivant</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../qelectrotech.qrc">
+ <normaloff>:/ico/16x16/arrow-right.png</normaloff>:/ico/16x16/arrow-right.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="editor_layout" stretch="0">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" name="label_layout" stretch="0,0,0">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <widget class="QLabel" name="type_label">
+ <property name="text">
+ <string>Type</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="value_label">
+ <property name="text">
+ <string>Valeur</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="increase_label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Incrémentation</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<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="QDialogButtonBox" name="buttonBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -297,7 +245,7 @@
</layout>
</widget>
<resources>
- <include location="../../qelectrotech.qrc"/>
+ <include location="../../../qelectrotech.qrc"/>
</resources>
<connections/>
</ui>
Modified: trunk/sources/projectconfigpages.cpp
===================================================================
--- trunk/sources/projectconfigpages.cpp 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/projectconfigpages.cpp 2017-02-26 18:30:34 UTC (rev 4920)
@@ -222,7 +222,6 @@
ProjectConfigPage(project, parent)
{
initWidgets();
- initLayout();
buildConnections();
readValuesFromProject();
}
@@ -254,130 +253,104 @@
* @brief ProjectAutoNumConfigPage::initWidgets
* Init some widget of this page
*/
-void ProjectAutoNumConfigPage::initWidgets() {
-
- tab_widget = new QTabWidget(this);
-
- management_tab_widget = new QWidget(this);
- m_amw = new AutoNumberingManagementW(project(), management_tab_widget);
-
- //Conductor Tab
- conductor_tab_widget = new QWidget(this);
- conductor_tab_widget->setObjectName("ConductorTab");
-
- m_label_conductor = new QLabel(tr("Numérotations disponibles :", "availables numerotations"), conductor_tab_widget);
-
- m_context_cb_conductor= new QComboBox(conductor_tab_widget);
+void ProjectAutoNumConfigPage::initWidgets()
+{
+ QTabWidget *tab_widget = new QTabWidget(this);
+
+ //Management tab
+ m_amw = new AutoNumberingManagementW(project());
+ tab_widget->addTab(m_amw, tr("Management"));
+
+ //Conductor tab
+ QWidget *conductor_widget = new QWidget();
+ QVBoxLayout *conductor_layout = new QVBoxLayout(conductor_widget);
+ QHBoxLayout *bp_conductor_layout = new QHBoxLayout();
+
+ QLabel *label_conductor = new QLabel(tr("Numérotations disponibles :", "availables numerotations"));
+ m_context_cb_conductor= new QComboBox();
m_context_cb_conductor->setEditable(true);
m_context_cb_conductor->lineEdit()->setClearButtonEnabled(true);
m_context_cb_conductor->addItem(tr("Nom de la nouvelle numérotation"));
-
- m_remove_pb_conductor= new QPushButton(QET::Icons::EditDelete, QString(), conductor_tab_widget);
+
+ m_remove_pb_conductor= new QPushButton(QET::Icons::EditDelete, QString());
m_remove_pb_conductor-> setToolTip(tr("Supprimer la numérotation"));
-
- m_saw_conductor = new SelectAutonumW(conductor_tab_widget);
-
- //Element Tab
- element_tab_widget = new QWidget(this);
- element_tab_widget->setObjectName("ElementTab");
-
- m_label_element = new QLabel(tr("Numérotations disponibles :", "availables numerotations"), element_tab_widget);
-
- m_context_cb_element = new QComboBox(element_tab_widget);
+
+ m_saw_conductor = new SelectAutonumW(1);
+
+ bp_conductor_layout->addWidget(label_conductor);
+ bp_conductor_layout->addStretch();
+ bp_conductor_layout->addWidget(m_context_cb_conductor);
+ bp_conductor_layout->addWidget(m_remove_pb_conductor);
+
+ conductor_layout->addLayout(bp_conductor_layout);
+ conductor_layout->addWidget(m_saw_conductor);
+
+ tab_widget->addTab(conductor_widget, tr("Conducteur"));
+
+ //Element tab
+ QWidget *element_widget = new QWidget();
+ QVBoxLayout *element_layout = new QVBoxLayout(element_widget);
+ QHBoxLayout *bp_element_layout = new QHBoxLayout();
+
+ QLabel *label_element = new QLabel(tr("Numérotations disponibles :", "availables numerotations"));
+
+ m_context_cb_element = new QComboBox();
m_context_cb_element->setEditable(true);
m_context_cb_element->lineEdit()->setClearButtonEnabled(true);
m_context_cb_element->addItem(tr("Nom de la nouvelle numérotation"));
-
- m_remove_pb_element = new QPushButton(QET::Icons::EditDelete, QString(), element_tab_widget);
+
+ m_remove_pb_element = new QPushButton(QET::Icons::EditDelete, QString());
m_remove_pb_element -> setToolTip(tr("Supprimer la numérotation"));
-
- m_saw_element = new SelectAutonumW(element_tab_widget);
-
- //Folio Tab
- folio_tab_widget = new QWidget(this);
- folio_tab_widget->setObjectName("FolioTab");
-
- m_label_folio = new QLabel(tr("Numérotations disponibles :", "availables numerotations"), folio_tab_widget);
-
- m_context_cb_folio = new QComboBox(folio_tab_widget);
+
+ m_saw_element = new SelectAutonumW(0);
+
+ bp_element_layout->addWidget(label_element);
+ bp_element_layout->addStretch();
+ bp_element_layout->addWidget(m_context_cb_element);
+ bp_element_layout->addWidget(m_remove_pb_element);
+
+ element_layout->addLayout(bp_element_layout);
+ element_layout->addWidget(m_saw_element);
+
+ tab_widget->addTab(element_widget, tr("Element"));
+
+ //Folio Tab
+ QWidget *folio_widget = new QWidget();
+ QVBoxLayout *folio_layout = new QVBoxLayout(folio_widget);
+ QHBoxLayout *bp_folio_layout = new QHBoxLayout();
+
+ QLabel *label_folio = new QLabel(tr("Numérotations disponibles :", "availables numerotations"));
+
+ m_context_cb_folio = new QComboBox();
m_context_cb_folio->setEditable(true);
m_context_cb_folio->lineEdit()->setClearButtonEnabled(true);
m_context_cb_folio->addItem(tr("Nom de la nouvelle numérotation"));
-
- m_remove_pb_folio = new QPushButton(QET::Icons::EditDelete, QString(), folio_tab_widget);
+
+ m_remove_pb_folio = new QPushButton(QET::Icons::EditDelete, QString());
m_remove_pb_folio -> setToolTip(tr("Supprimer la numérotation"));
-
- m_saw_folio = new SelectAutonumW(folio_tab_widget);
-
- //AutoNumbering Tab
- autoNumbering_tab_widget = new QWidget(this);
- m_faw = new FolioAutonumberingW(project(),autoNumbering_tab_widget);
+
+ m_saw_folio = new SelectAutonumW(2);
+
+ bp_folio_layout->addWidget(label_folio);
+ bp_folio_layout->addStretch();
+ bp_folio_layout->addWidget(m_context_cb_folio);
+ bp_folio_layout->addWidget(m_remove_pb_folio);
+
+ folio_layout->addLayout(bp_folio_layout);
+ folio_layout->addWidget(m_saw_folio);
+
+ tab_widget->addTab(folio_widget, tr("Folio"));
+
+ //AutoNumbering Tab
+ m_faw = new FolioAutonumberingW(project());
+ tab_widget->addTab(m_faw, tr("Folio autonumérotation"));
+
+ m_main_layout = new QHBoxLayout();
+ m_main_layout->addWidget(tab_widget);
+ setLayout(m_main_layout);
}
/**
- * @brief ProjectAutoNumConfigPage::initLayout
- * Init the layout of this page
- */
-void ProjectAutoNumConfigPage::initLayout() {
-
- //Management Tab
- tab_widget->addTab(management_tab_widget, tr("Management"));
-
- //Conductor Tab
- tab_widget->addTab(conductor_tab_widget, tr("Conductor"));
-
- QHBoxLayout *context_layout_conductor = new QHBoxLayout();
- context_layout_conductor -> addWidget (m_label_conductor);
- context_layout_conductor -> addWidget (m_context_cb_conductor);
- context_layout_conductor -> addWidget (m_remove_pb_conductor);
-
- QVBoxLayout *main_layout_conductor = new QVBoxLayout();
- QVBoxLayout *aux_layout_conductor = new QVBoxLayout();
- aux_layout_conductor->addLayout(context_layout_conductor);
- aux_layout_conductor->addWidget(m_saw_conductor);
-
- main_layout_conductor->addLayout(aux_layout_conductor);
- conductor_tab_widget -> setLayout (main_layout_conductor);
-
- //Element Tab
- tab_widget->addTab(element_tab_widget,tr ("Element"));
-
- QHBoxLayout *element_context_layout = new QHBoxLayout();
- element_context_layout -> addWidget (m_label_element);
- element_context_layout -> addWidget (m_context_cb_element);
- element_context_layout -> addWidget (m_remove_pb_element);
-
- QVBoxLayout *main_layout_element = new QVBoxLayout();
- QVBoxLayout *aux_layout_element = new QVBoxLayout();
- aux_layout_element->addLayout(element_context_layout);
- aux_layout_element->addWidget(m_saw_element);
-
- main_layout_element->addLayout(aux_layout_element);
- element_tab_widget->setLayout(main_layout_element);
-
- // Folio Tab
- tab_widget->addTab(folio_tab_widget, tr("Folio"));
-
- QHBoxLayout *context_layout_folio = new QHBoxLayout();
- context_layout_folio -> addWidget (m_label_folio);
- context_layout_folio -> addWidget (m_context_cb_folio);
- context_layout_folio -> addWidget (m_remove_pb_folio);
-
- QVBoxLayout *main_layout_folio = new QVBoxLayout();
- QVBoxLayout *aux_layout_folio = new QVBoxLayout();
- aux_layout_folio->addLayout(context_layout_folio);
- aux_layout_folio->addWidget(m_saw_folio);
-
- main_layout_folio->addLayout(aux_layout_folio);
- folio_tab_widget->setLayout(main_layout_folio);
-
- //Auto Numbering Tab
- tab_widget->addTab(autoNumbering_tab_widget,tr ("Folio Auto Numbering"));
-
- tab_widget->resize(850,590);
-}
-
-/**
* @brief ProjectAutoNumConfigPage::readValuesFromProject
* Read value stored on project, and update display
*/
@@ -417,7 +390,7 @@
*/
void ProjectAutoNumConfigPage::buildConnections() {
- connect(tab_widget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int)));
+ //connect(m_tab_widget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int)));
//Management Tab
connect (m_amw, SIGNAL(applyPressed()), this, SLOT(applyManagement()));
@@ -724,26 +697,7 @@
* @param tab index
* Change to Selected Tab
*/
-void ProjectAutoNumConfigPage::changeToTab(int i){
- tab_widget->setCurrentIndex(i);
+void ProjectAutoNumConfigPage::changeToTab(int i)
+{
+ Q_UNUSED(i);
}
-
-/**
- * @brief ProjectAutoNumConfigPage::tabChanged
- * @param tab index
- * Used to resize window to correct size
- */
-void ProjectAutoNumConfigPage::tabChanged(int i){
- if (i>=1){
- if (tab_widget->currentIndex() == 4){
- tab_widget->resize(520,tab_widget->height());
- }
- else if (tab_widget->currentIndex() == 1 || tab_widget->currentIndex() == 2 ){
- tab_widget->resize(495,tab_widget->height());
- }
- else tab_widget->resize(475,tab_widget->height());
- }
- else {
- tab_widget->resize(850,tab_widget->height());
- }
-}
Modified: trunk/sources/projectconfigpages.h
===================================================================
--- trunk/sources/projectconfigpages.h 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/projectconfigpages.h 2017-02-26 18:30:34 UTC (rev 4920)
@@ -33,8 +33,8 @@
class FolioAutonumberingW;
class FormulaAutonumberingW;
class AutoNumberingManagementW;
-class QTabWidget;
class QScrollArea;
+class QHBoxLayout;
/**
This class, derived from ConfigPage, aims at providing the basic skeleton
@@ -134,7 +134,7 @@
virtual void changeToTab(int);
protected:
virtual void initWidgets();
- virtual void initLayout();
+ virtual void initLayout() {}
virtual void readValuesFromProject();
virtual void adjustReadOnly();
private:
@@ -153,8 +153,6 @@
void applyAutoNum();
void applyManagement();
- void tabChanged(int);
-
signals:
void setAutoNum(QString);
void setAutoNum(int,int);
@@ -163,16 +161,13 @@
//Attributes
private:
- QTabWidget *tab_widget;
- QWidget *management_tab_widget;
+ QHBoxLayout *m_main_layout = nullptr;
+ QWidget *m_management_tab_widget;
QWidget *conductor_tab_widget;
QWidget *element_tab_widget;
QWidget *folio_tab_widget;
QWidget *autoNumbering_tab_widget;
QScrollArea *scrollArea;
- QLabel *m_label_conductor;
- QLabel *m_label_folio;
- QLabel *m_label_element;
QComboBox *m_context_cb_conductor;
QComboBox *m_context_cb_folio;
QComboBox *m_context_cb_element;
Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp 2017-02-25 21:59:56 UTC (rev 4919)
+++ trunk/sources/qetdiagrameditor.cpp 2017-02-26 18:30:34 UTC (rev 4920)
@@ -43,8 +43,6 @@
#include "elementscollectionwidget.h"
#include "autonumberingdockwidget.h"
-#include "ui/dialogautonum.h"
-
#include <QMessageBox>
#include <QStandardPaths>