From 449543f203afa0eab07160a63db4480caff487c5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 24 Feb 2017 19:42:06 +0200 Subject: [PATCH] Show warning icon if only both requirements are false. --HG-- branch : feature --- src/libs/vtools/dialogs/tools/dialogseamallowance.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp index 8db23777e..01b839741 100644 --- a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp @@ -1010,7 +1010,7 @@ void DialogSeamAllowance::UpdateValues() } flagGFormulas = bFormulasOK; - if (flagGFormulas == false) + if (not flagGFormulas && not flagGPin) { QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"); ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabGrainline), icon); @@ -1297,8 +1297,11 @@ void DialogSeamAllowance::GrainlinePinPointChanged() flagGPin = false; color = errorColor; - QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"); - ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabGrainline), icon); + if (not flagGFormulas && not flagGPin) + { + QIcon icon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"); + ui->tabWidget->setTabIcon(ui->tabWidget->indexOf(ui->tabGrainline), icon); + } } ChangeColor(ui->labelGrainlineTopPin, color); ChangeColor(ui->labelGrainlineBottomPin, color);