Show warning icon and pin points for tab Labels.
--HG-- branch : feature
This commit is contained in:
Roman Telezhynskyi
parent
367c78936a
commit
08d712ffb6
|
|
@ -138,6 +138,7 @@ void DialogSeamAllowance::EnableApply(bool enable)
|
||||||
ui->tabSeamAllowance->setEnabled(applyAllowed);
|
ui->tabSeamAllowance->setEnabled(applyAllowed);
|
||||||
ui->tabInternalPaths->setEnabled(applyAllowed);
|
ui->tabInternalPaths->setEnabled(applyAllowed);
|
||||||
ui->tabPieceLabelData->setEnabled(applyAllowed);
|
ui->tabPieceLabelData->setEnabled(applyAllowed);
|
||||||
|
ui->tabLabels->setEnabled(applyAllowed);
|
||||||
ui->tabGrainline->setEnabled(applyAllowed);
|
ui->tabGrainline->setEnabled(applyAllowed);
|
||||||
ui->tabPins->setEnabled(applyAllowed);
|
ui->tabPins->setEnabled(applyAllowed);
|
||||||
}
|
}
|
||||||
|
|
@ -920,7 +921,7 @@ void DialogSeamAllowance::TabChanged(int index)
|
||||||
{
|
{
|
||||||
if (index == ui->tabWidget->indexOf(ui->tabPins)
|
if (index == ui->tabWidget->indexOf(ui->tabPins)
|
||||||
|| index == ui->tabWidget->indexOf(ui->tabGrainline)
|
|| index == ui->tabWidget->indexOf(ui->tabGrainline)
|
||||||
|| index == ui->tabWidget->indexOf(ui->tabPieceLabelData))
|
|| index == ui->tabWidget->indexOf(ui->tabLabels))
|
||||||
{
|
{
|
||||||
if (m_visPins.isNull())
|
if (m_visPins.isNull())
|
||||||
{
|
{
|
||||||
|
|
@ -1326,7 +1327,7 @@ void DialogSeamAllowance::DetailPinPointChanged()
|
||||||
|
|
||||||
if (flagPPin)
|
if (flagPPin)
|
||||||
{
|
{
|
||||||
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabPieceLabelData), QIcon());
|
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabLabels), QIcon());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -1335,7 +1336,7 @@ void DialogSeamAllowance::DetailPinPointChanged()
|
||||||
color = errorColor;
|
color = errorColor;
|
||||||
|
|
||||||
QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png");
|
QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png");
|
||||||
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabPieceLabelData), icon);
|
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabLabels), icon);
|
||||||
}
|
}
|
||||||
ChangeColor(ui->labelDetailLabelTopLeftPin, color);
|
ChangeColor(ui->labelDetailLabelTopLeftPin, color);
|
||||||
ChangeColor(ui->labelDetailLabelBottomRightPin, color);
|
ChangeColor(ui->labelDetailLabelBottomRightPin, color);
|
||||||
|
|
@ -1356,7 +1357,7 @@ void DialogSeamAllowance::PatternPinPointChanged()
|
||||||
|
|
||||||
if (flagDPin)
|
if (flagDPin)
|
||||||
{
|
{
|
||||||
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabPieceLabelData), QIcon());
|
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabLabels), QIcon());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -1365,7 +1366,7 @@ void DialogSeamAllowance::PatternPinPointChanged()
|
||||||
color = errorColor;
|
color = errorColor;
|
||||||
|
|
||||||
QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png");
|
QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png");
|
||||||
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabPieceLabelData), icon);
|
ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabLabels), icon);
|
||||||
}
|
}
|
||||||
ChangeColor(ui->labelPatternLabelTopLeftPin, color);
|
ChangeColor(ui->labelPatternLabelTopLeftPin, color);
|
||||||
ChangeColor(ui->labelPatternLabelBottomRightPin, color);
|
ChangeColor(ui->labelPatternLabelBottomRightPin, color);
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>521</width>
|
<width>639</width>
|
||||||
<height>611</height>
|
<height>680</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
|
@ -20,9 +20,6 @@
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
|
||||||
<number>3</number>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="tabMainPath">
|
<widget class="QWidget" name="tabMainPath">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Main path</string>
|
<string>Main path</string>
|
||||||
|
|
@ -1027,87 +1024,17 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
<spacer name="verticalSpacer_3">
|
||||||
<item>
|
<property name="orientation">
|
||||||
<widget class="QGroupBox" name="groupBoxDetailLabel">
|
<enum>Qt::Vertical</enum>
|
||||||
<property name="title">
|
</property>
|
||||||
<string>Detail label visible</string>
|
<property name="sizeHint" stdset="0">
|
||||||
</property>
|
<size>
|
||||||
<property name="flat">
|
<width>20</width>
|
||||||
<bool>true</bool>
|
<height>40</height>
|
||||||
</property>
|
</size>
|
||||||
<property name="checkable">
|
</property>
|
||||||
<bool>true</bool>
|
</spacer>
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout_4">
|
|
||||||
<property name="fieldGrowthPolicy">
|
|
||||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="labelDetailLabelTopLeftPin">
|
|
||||||
<property name="text">
|
|
||||||
<string>Top left pin:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QComboBox" name="comboBoxDetailLabelTopLeftPin"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelDetailLabelBottomRightPin">
|
|
||||||
<property name="text">
|
|
||||||
<string>Bottom right pin:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QComboBox" name="comboBoxDetailLabelBottomRightPin"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBoxPatternLabel">
|
|
||||||
<property name="title">
|
|
||||||
<string>Pattern label visible</string>
|
|
||||||
</property>
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout_5">
|
|
||||||
<property name="fieldGrowthPolicy">
|
|
||||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="labelPatternLabelTopLeftPin">
|
|
||||||
<property name="text">
|
|
||||||
<string>Top left pin:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QComboBox" name="comboBoxPatternLabelTopLeftPin"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelPatternLabelBottomRightPin">
|
|
||||||
<property name="text">
|
|
||||||
<string>Bottom right pin:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QComboBox" name="comboBoxPatternLabelBottomRightPin"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
@ -1126,6 +1053,102 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QWidget" name="tabLabels">
|
||||||
|
<attribute name="title">
|
||||||
|
<string>Labels</string>
|
||||||
|
</attribute>
|
||||||
|
<widget class="QGroupBox" name="groupBoxDetailLabel">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>30</x>
|
||||||
|
<y>40</y>
|
||||||
|
<width>234</width>
|
||||||
|
<height>96</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string>Detail label visible</string>
|
||||||
|
</property>
|
||||||
|
<property name="flat">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout_4">
|
||||||
|
<property name="fieldGrowthPolicy">
|
||||||
|
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="labelDetailLabelTopLeftPin">
|
||||||
|
<property name="text">
|
||||||
|
<string>Top left pin:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QComboBox" name="comboBoxDetailLabelTopLeftPin"/>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="labelDetailLabelBottomRightPin">
|
||||||
|
<property name="text">
|
||||||
|
<string>Bottom right pin:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QComboBox" name="comboBoxDetailLabelBottomRightPin"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QGroupBox" name="groupBoxPatternLabel">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>30</x>
|
||||||
|
<y>240</y>
|
||||||
|
<width>234</width>
|
||||||
|
<height>198</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string>Pattern label visible</string>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout_5">
|
||||||
|
<property name="fieldGrowthPolicy">
|
||||||
|
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="labelPatternLabelTopLeftPin">
|
||||||
|
<property name="text">
|
||||||
|
<string>Top left pin:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QComboBox" name="comboBoxPatternLabelTopLeftPin"/>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="labelPatternLabelBottomRightPin">
|
||||||
|
<property name="text">
|
||||||
|
<string>Bottom right pin:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QComboBox" name="comboBoxPatternLabelBottomRightPin"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
<widget class="QWidget" name="tabGrainline">
|
<widget class="QWidget" name="tabGrainline">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Grainline</string>
|
<string>Grainline</string>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user