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

Tab Pins moved to be second in the list after tab Paths.

Browse Source 
(grafted from 6dade874f3c6417db907d0c00760006aba4bd702)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-05-26 19:39:42 +03:00
parent f9060f1bb7
commit 6e1eabaf29
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -10,7 +10,8 @@
- [#689] Grainline default values swapped around. - [#689] Grainline default values swapped around.
- [#688] Difficult to enter numbers in Tape. - [#688] Difficult to enter numbers in Tape.
- Fixed bug in Tape app. Tape showed birth date in wrong locale. - 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 # 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.

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

@ -48,7 +48,7 @@
#include <QTimer> #include <QTimer>
#include <QtNumeric> #include <QtNumeric>
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 namespace
{ {
@ -179,9 +179,9 @@ void DialogSeamAllowance::EnableApply(bool enable)
uiTabPaths->tabSeamAllowance->setEnabled(applyAllowed); uiTabPaths->tabSeamAllowance->setEnabled(applyAllowed);
uiTabPaths->tabInternalPaths->setEnabled(applyAllowed); uiTabPaths->tabInternalPaths->setEnabled(applyAllowed);
m_ftb->SetTabEnabled(TabOrder::Pins, applyAllowed);
m_ftb->SetTabEnabled(TabOrder::Labels, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Labels, applyAllowed);
m_ftb->SetTabEnabled(TabOrder::Grainline, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Grainline, applyAllowed);
m_ftb->SetTabEnabled(TabOrder::Pins, applyAllowed);
m_ftb->SetTabEnabled(TabOrder::Passmarks, applyAllowed); m_ftb->SetTabEnabled(TabOrder::Passmarks, applyAllowed);
} }
@ -1115,15 +1115,15 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default")
case TabOrder::Paths: case TabOrder::Paths:
m_tabPaths->show(); m_tabPaths->show();
break; break;
case TabOrder::Pins:
m_tabPins->show();
break;
case TabOrder::Labels: case TabOrder::Labels:
m_tabLabels->show(); m_tabLabels->show();
break; break;
case TabOrder::Grainline: case TabOrder::Grainline:
m_tabGrainline->show(); m_tabGrainline->show();
break; break;
case TabOrder::Pins:
m_tabPins->show();
break;
case TabOrder::Passmarks: case TabOrder::Passmarks:
m_tabPassmarks->show(); m_tabPassmarks->show();
break; break;
@ -2426,9 +2426,9 @@ void DialogSeamAllowance::UpdateNodeSAAfter(const QString &formula)
void DialogSeamAllowance::InitFancyTabBar() void DialogSeamAllowance::InitFancyTabBar()
{ {
m_ftb->InsertTab(TabOrder::Paths, QIcon("://icon/32x32/paths.png"), tr("Paths")); 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::Labels, QIcon("://icon/32x32/labels.png"), tr("Labels"));
m_ftb->InsertTab(TabOrder::Grainline, QIcon("://icon/32x32/grainline.png"), tr("Grainline")); 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")); m_ftb->InsertTab(TabOrder::Passmarks, QIcon("://icon/32x32/passmark.png"), tr("Passmarks"));
ui->horizontalLayout->addWidget(m_ftb, 0, Qt::AlignLeft); ui->horizontalLayout->addWidget(m_ftb, 0, Qt::AlignLeft);