aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-02-16 17:25:47 +02:00
parent 99aea913a8
commit dfd89778e3
3 changed files with 309 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -1,4 +1,5 @@
# Version 0.4.2 # Version 0.4.2
- Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze.
- Fixed getting correct reversed segment for single in the list curve. - Fixed getting correct reversed segment for single in the list curve.
- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list - Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list
has been scrolled. Fixed validation when the list conatains only curve. has been scrolled. Fixed validation when the list conatains only curve.

308
src/libs/vtools/dialogs/tools/dialogspline.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>540</width> <width>459</width>
<height>233</height> <height>256</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,76 +20,133 @@
<property name="locale"> <property name="locale">
<locale language="English" country="UnitedStates"/> <locale language="English" country="UnitedStates"/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="spacing">
<number>6</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="labelFirstPoint"> <widget class="QLabel" name="labelFirstPoint">
<property name="minimumSize">
<size>
<width>89</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>First point</string> <string>First point</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxP1"/> <widget class="QComboBox" name="comboBoxP1">
</item> <property name="sizePolicy">
</layout> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<layout class="QHBoxLayout" name="horizontalLayout_3"> </sizepolicy>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Length ratio of the first control point</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm1">
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <widget class="QGroupBox" name="groupBox">
<item> <property name="title">
<widget class="QLabel" name="label_3"> <string>Control point</string>
<property name="text"> </property>
<string>The angle of the first control point</string> <layout class="QVBoxLayout" name="verticalLayout_2">
</property> <item>
<property name="wordWrap"> <layout class="QFormLayout" name="formLayout_2">
<bool>true</bool> <item row="0" column="1">
</property> <widget class="QDoubleSpinBox" name="doubleSpinBoxKasm1">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<item> <horstretch>0</horstretch>
<widget class="QSpinBox" name="spinBoxAngle1"> <verstretch>0</verstretch>
<property name="maximum"> </sizepolicy>
<number>360</number> </property>
</property> <property name="singleStep">
</widget> <double>0.010000000000000</double>
</item> </property>
</layout> <property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Angle</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBoxAngle1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>360</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Length ratio</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QLabel" name="labelSecondPoint"> <widget class="QLabel" name="labelSecondPoint">
<property name="text"> <property name="text">
@ -98,54 +155,102 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxP4"/> <widget class="QComboBox" name="comboBoxP4">
</item> <property name="sizePolicy">
</layout> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<layout class="QHBoxLayout" name="horizontalLayout_6"> </sizepolicy>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Length ratio of the second control point</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm2">
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <widget class="QGroupBox" name="groupBox_2">
<item> <property name="title">
<widget class="QLabel" name="label_7"> <string>Control point</string>
<property name="text"> </property>
<string>The angle of the second control point</string> <layout class="QVBoxLayout" name="verticalLayout_4">
</property> <item>
<property name="wordWrap"> <layout class="QFormLayout" name="formLayout_3">
<bool>true</bool> <item row="0" column="0">
</property> <widget class="QLabel" name="label_6">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<item> <horstretch>0</horstretch>
<widget class="QSpinBox" name="spinBoxAngle2"> <verstretch>0</verstretch>
<property name="maximum"> </sizepolicy>
<number>360</number> </property>
</property> <property name="minimumSize">
</widget> <size>
</item> <width>0</width>
</layout> <height>0</height>
</size>
</property>
<property name="text">
<string>Length ratio</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Angle</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBoxAngle2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>360</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -178,7 +283,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBoxKcurve"> <widget class="QDoubleSpinBox" name="doubleSpinBoxKcurve">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -205,7 +310,14 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="comboBoxColor"/> <widget class="QComboBox" name="comboBoxColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -228,6 +340,8 @@
<tabstop>comboBoxP4</tabstop> <tabstop>comboBoxP4</tabstop>
<tabstop>doubleSpinBoxKasm2</tabstop> <tabstop>doubleSpinBoxKasm2</tabstop>
<tabstop>spinBoxAngle2</tabstop> <tabstop>spinBoxAngle2</tabstop>
<tabstop>doubleSpinBoxKcurve</tabstop>
<tabstop>comboBoxColor</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
@ -241,8 +355,8 @@
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>248</x> <x>257</x>
<y>254</y> <y>246</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>157</x> <x>157</x>
@ -257,8 +371,8 @@
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>316</x> <x>325</x>
<y>260</y> <y>246</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>286</x> <x>286</x>

195
src/libs/vtools/dialogs/tools/dialogsplinepath.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>528</width> <width>519</width>
<height>322</height> <height>368</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,17 +20,17 @@
<property name="locale"> <property name="locale">
<locale language="English" country="UnitedStates"/> <locale language="English" country="UnitedStates"/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Point of curve</string> <string>Point</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -40,94 +40,99 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QGroupBox" name="groupBox">
<item> <property name="title">
<widget class="QLabel" name="label_2"> <string>First control point</string>
<property name="text"> </property>
<string>Length ratio of the first control point</string> <layout class="QFormLayout" name="formLayout_2">
</property> <property name="fieldGrowthPolicy">
<property name="wordWrap"> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<bool>true</bool> </property>
</property> <item row="3" column="0">
</widget> <widget class="QLabel" name="label_3">
</item> <property name="text">
<item> <string>Angle</string>
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm1"> </property>
<property name="singleStep"> <property name="wordWrap">
<double>0.010000000000000</double> <bool>true</bool>
</property> </property>
<property name="value"> </widget>
<double>1.000000000000000</double> </item>
</property> <item row="3" column="1">
</widget> <widget class="QDoubleSpinBox" name="doubleSpinBoxAngle1">
</item> <property name="maximum">
</layout> <double>360.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm1">
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Length ratio</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <widget class="QGroupBox" name="groupBox_2">
<item> <property name="title">
<widget class="QLabel" name="label_3"> <string>Second control point</string>
<property name="text"> </property>
<string>The angle of the first control point</string> <layout class="QFormLayout" name="formLayout_3">
</property> <item row="0" column="0">
<property name="wordWrap"> <widget class="QLabel" name="label_6">
<bool>true</bool> <property name="text">
</property> <string>Length ratio</string>
</widget> </property>
</item> <property name="wordWrap">
<item> <bool>true</bool>
<widget class="QDoubleSpinBox" name="doubleSpinBoxAngle1"> </property>
<property name="maximum"> </widget>
<double>360.000000000000000</double> </item>
</property> <item row="0" column="1">
</widget> <widget class="QDoubleSpinBox" name="doubleSpinBoxKasm2">
</item> <property name="singleStep">
</layout> <double>0.010000000000000</double>
</item> </property>
<item> <property name="value">
<layout class="QHBoxLayout" name="horizontalLayout_6"> <double>1.000000000000000</double>
<item> </property>
<widget class="QLabel" name="label_6"> </widget>
<property name="text"> </item>
<string>Length ratio of the second control point</string> <item row="1" column="0">
</property> <widget class="QLabel" name="label_7">
<property name="wordWrap"> <property name="text">
<bool>true</bool> <string>Angle</string>
</property> </property>
</widget> <property name="wordWrap">
</item> <bool>true</bool>
<item> </property>
<widget class="QDoubleSpinBox" name="doubleSpinBoxKasm2"> </widget>
<property name="singleStep"> </item>
<double>0.010000000000000</double> <item row="1" column="1">
</property> <widget class="QDoubleSpinBox" name="doubleSpinBoxAngle2">
<property name="value"> <property name="maximum">
<double>1.000000000000000</double> <double>360.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>The angle of the second control point</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBoxAngle2">
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
@ -211,12 +216,6 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>comboBoxPoint</tabstop>
<tabstop>doubleSpinBoxKasm1</tabstop>
<tabstop>doubleSpinBoxAngle1</tabstop>
<tabstop>doubleSpinBoxKasm2</tabstop>
<tabstop>doubleSpinBoxAngle2</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>