diff --git a/ChangeLog.txt b/ChangeLog.txt index 98185333d..e8d423951 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,7 +10,8 @@ - [#689] Grainline default values swapped around. - [#688] Difficult to enter numbers in Tape. - Fixed bug in Tape app. Tape showed birth date in wrong locale. -- Fixed bug in dialog Internal Piece Path. Value from the field After rewrited data in the field Before. +- Fixed bug in dialog Internal Piece Path. Value from the field After rewrited data in the field Before. +- Tab Pins moved to be second in the list after tab Paths. # Version 0.5.0 May 9, 2017 - [#581] User can now filter input lists by keyword in function wizard. diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index dc24ff239..096ff7b17 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -48,7 +48,7 @@ #include #include -enum TabOrder {Paths=0, Labels=1, Grainline=2, Pins=3, Passmarks=4, Count=5}; +enum TabOrder {Paths=0, Pins=1, Labels=2, Grainline=3, Passmarks=4, Count=5}; namespace { @@ -179,9 +179,9 @@ void DialogSeamAllowance::EnableApply(bool enable) uiTabPaths->tabSeamAllowance->setEnabled(applyAllowed); uiTabPaths->tabInternalPaths->setEnabled(applyAllowed); + m_ftb->SetTabEnabled(TabOrder::Pins, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Labels, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Grainline, applyAllowed); - m_ftb->SetTabEnabled(TabOrder::Pins, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Passmarks, applyAllowed); } @@ -1115,15 +1115,15 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") case TabOrder::Paths: m_tabPaths->show(); break; + case TabOrder::Pins: + m_tabPins->show(); + break; case TabOrder::Labels: m_tabLabels->show(); break; case TabOrder::Grainline: m_tabGrainline->show(); break; - case TabOrder::Pins: - m_tabPins->show(); - break; case TabOrder::Passmarks: m_tabPassmarks->show(); break; @@ -2426,9 +2426,9 @@ void DialogSeamAllowance::UpdateNodeSAAfter(const QString &formula) void DialogSeamAllowance::InitFancyTabBar() { m_ftb->InsertTab(TabOrder::Paths, QIcon("://icon/32x32/paths.png"), tr("Paths")); + m_ftb->InsertTab(TabOrder::Pins, QIcon("://icon/32x32/pins.png"), tr("Pins")); m_ftb->InsertTab(TabOrder::Labels, QIcon("://icon/32x32/labels.png"), tr("Labels")); m_ftb->InsertTab(TabOrder::Grainline, QIcon("://icon/32x32/grainline.png"), tr("Grainline")); - m_ftb->InsertTab(TabOrder::Pins, QIcon("://icon/32x32/pins.png"), tr("Pins")); m_ftb->InsertTab(TabOrder::Passmarks, QIcon("://icon/32x32/passmark.png"), tr("Passmarks")); ui->horizontalLayout->addWidget(m_ftb, 0, Qt::AlignLeft);