palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-29 07:38:11 +02:00
Code Issues Projects Releases Wiki Activity

When user doesn't change current pattern piece name he must be able to close

Browse source 
the dialog by clicking on OK.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-01-16 19:22:18 +02:00
parent b43962d40d
commit 69364be0ee
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/valentina/mainwindow.cpp
View file

@ -4432,7 +4432,7 @@ void MainWindow::InitAutoSave()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString MainWindow::PatternPieceName(const QString &text) QString MainWindow::PatternPieceName(const QString &text)
{ {
QInputDialog *dlg = new QInputDialog(this); QScopedPointer<QInputDialog> dlg(new QInputDialog(this));
dlg->setInputMode( QInputDialog::TextInput ); dlg->setInputMode( QInputDialog::TextInput );
dlg->setLabelText(tr("Pattern piece:")); dlg->setLabelText(tr("Pattern piece:"));
dlg->setTextEchoMode(QLineEdit::Normal); dlg->setTextEchoMode(QLineEdit::Normal);
@ -4444,17 +4444,16 @@ QString MainWindow::PatternPieceName(const QString &text)
{ {
const bool bOk = dlg->exec(); const bool bOk = dlg->exec();
nameDraw = dlg->textValue(); nameDraw = dlg->textValue();
if (bOk == false || nameDraw.isEmpty()) if (bOk == false || nameDraw.isEmpty() || text == nameDraw)
{ {
delete dlg;
return QString(); return QString();
} }
if (comboBoxDraws->findText(nameDraw) == -1) if (comboBoxDraws->findText(nameDraw) == -1)
{ {
break;//repeate show dialog break;//repeate show dialog
} }
} }
delete dlg;
return nameDraw; return nameDraw;
} }