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

Resolved issue #683. Tool Seam allowance's dialog is off screen on small

Browse Source 
resolutions.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-05-13 11:55:02 +03:00
parent c02ef13ed4
commit 037fe89e27
8 changed files with 3167 additions and 3103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -1,6 +1,9 @@
# Version 0.6.0 # Version 0.6.0
- [#682] New feature. Export increments to Excel .csv. - [#682] New feature. Export increments to Excel .csv.
# Version 0.5.1
- [#683] Tool Seam allowance's dialog is off screen on small resolutions.
# Version 0.5.0 May 9, 2017 # Version 0.5.0 May 9, 2017
- [#581] User can now filter input lists by keyword in function wizard. - [#581] User can now filter input lists by keyword in function wizard.
- [#24] User can now add labels with different information on the detail - [#24] User can now add labels with different information on the detail

18
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -89,7 +89,6 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
m_tabPins(new QWidget), m_tabPins(new QWidget),
m_tabPassmarks(new QWidget), m_tabPassmarks(new QWidget),
m_ftb(new FancyTabBar(FancyTabBar::Left, this)), m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
dialogIsInitialized(false),
applyAllowed(false),// By default disabled applyAllowed(false),// By default disabled
flagGPin(true), flagGPin(true),
flagDPin(true), flagDPin(true),
@ -425,21 +424,8 @@ void DialogSeamAllowance::closeEvent(QCloseEvent *event)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::showEvent(QShowEvent *event) void DialogSeamAllowance::showEvent(QShowEvent *event)
{ {
DialogTool::showEvent( event ); // Skip DialotTool implementation. For this tool don't need disable resizing because it uses a scroll area.
if ( event->spontaneous() ) QDialog::showEvent( event );
{
return;
}
if (dialogIsInitialized)
{
return;
}
// do your init stuff here
m_ftb->setMaximumSize(m_ftb->size());
m_ftb->setMinimumSize(m_ftb->size());
dialogIsInitialized = true;//first show windows are held
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

1
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
View File

@ -173,7 +173,6 @@ private:
FancyTabBar* m_ftb; FancyTabBar* m_ftb;
bool dialogIsInitialized;
bool applyAllowed; bool applyAllowed;
bool flagGPin; bool flagGPin;
bool flagDPin; bool flagDPin;

4
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>659</width> <width>593</width>
<height>574</height> <height>663</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

987
src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui
View File

File diff suppressed because it is too large Load Diff

3169
src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui
View File

File diff suppressed because it is too large Load Diff

351
src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui
View File

@ -6,182 +6,201 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>268</width> <width>352</width>
<height>377</height> <height>411</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">Form</string> <string notr="true">Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <widget class="QScrollArea" name="scrollArea">
<property name="fieldGrowthPolicy"> <property name="widgetResizable">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Passmark:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBoxPassmarks"/>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBoxMarkType">
<property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="title"> <widget class="QWidget" name="scrollAreaWidgetContents">
<string>Marks</string> <property name="geometry">
</property> <rect>
<layout class="QVBoxLayout" name="verticalLayout"> <x>0</x>
<item> <y>0</y>
<widget class="QRadioButton" name="radioButtonOneLine"> <width>332</width>
<property name="enabled"> <height>391</height>
<bool>false</bool> </rect>
</property> </property>
<property name="text"> <layout class="QVBoxLayout" name="verticalLayout_3">
<string>One line</string> <item>
</property> <layout class="QFormLayout" name="formLayout">
<attribute name="buttonGroup"> <property name="fieldGrowthPolicy">
<string notr="true">buttonGroupLineType</string> <enum>QFormLayout::ExpandingFieldsGrow</enum>
</attribute> </property>
</widget> <item row="0" column="0">
</item> <widget class="QLabel" name="label">
<item> <property name="text">
<widget class="QRadioButton" name="radioButtonTwoLines"> <string>Passmark:</string>
<property name="enabled"> </property>
<bool>false</bool> </widget>
</property> </item>
<property name="text"> <item row="0" column="1">
<string>Two lines</string> <widget class="QComboBox" name="comboBoxPassmarks"/>
</property> </item>
<attribute name="buttonGroup"> </layout>
<string notr="true">buttonGroupLineType</string> </item>
</attribute> <item>
</widget> <widget class="QGroupBox" name="groupBoxMarkType">
</item> <property name="enabled">
<item> <bool>true</bool>
<widget class="QRadioButton" name="radioButtonThreeLines"> </property>
<property name="enabled"> <property name="title">
<bool>false</bool> <string>Marks</string>
</property> </property>
<property name="text"> <layout class="QVBoxLayout" name="verticalLayout">
<string>Three lines</string> <item>
</property> <widget class="QRadioButton" name="radioButtonOneLine">
<attribute name="buttonGroup"> <property name="enabled">
<string notr="true">buttonGroupLineType</string> <bool>false</bool>
</attribute> </property>
</widget> <property name="text">
</item> <string>One line</string>
<item> </property>
<widget class="QRadioButton" name="radioButtonTMark"> <attribute name="buttonGroup">
<property name="enabled"> <string notr="true">buttonGroupLineType</string>
<bool>false</bool> </attribute>
</property> </widget>
<property name="text"> </item>
<string>T mark</string> <item>
</property> <widget class="QRadioButton" name="radioButtonTwoLines">
<attribute name="buttonGroup"> <property name="enabled">
<string notr="true">buttonGroupLineType</string> <bool>false</bool>
</attribute> </property>
</widget> <property name="text">
</item> <string>Two lines</string>
<item> </property>
<widget class="QRadioButton" name="radioButtonVMark"> <attribute name="buttonGroup">
<property name="enabled"> <string notr="true">buttonGroupLineType</string>
<bool>false</bool> </attribute>
</property> </widget>
<property name="text"> </item>
<string>V mark</string> <item>
</property> <widget class="QRadioButton" name="radioButtonThreeLines">
<attribute name="buttonGroup"> <property name="enabled">
<string notr="true">buttonGroupLineType</string> <bool>false</bool>
</attribute> </property>
</widget> <property name="text">
</item> <string>Three lines</string>
</layout> </property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupLineType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonTMark">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>T mark</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupLineType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonVMark">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>V mark</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupLineType</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBoxAngleType">
<property name="title">
<string>Angle</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="radioButtonStraightforward">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Straightforward</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Bisector</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonIntersection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Select if need designate the corner point as a passmark</string>
</property>
<property name="text">
<string>Intersection</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxShowSecondPassmark">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Show the second passmark on seam line</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>11</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBoxAngleType">
<property name="title">
<string>Angle</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="radioButtonStraightforward">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Straightforward</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Bisector</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonIntersection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Select if need designate the corner point as a passmark</string>
</property>
<property name="text">
<string>Intersection</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupAngleType</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxShowSecondPassmark">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Show the second passmark on seam line</string>
</property>
</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>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

1737
src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
View File

File diff suppressed because it is too large Load Diff