GH-2355 Do not allow instances to be created with whitespace prefix or suffix

This commit is contained in:
Petr Mrázek 2018-07-28 22:08:09 +02:00
parent 4169f53b19
commit 12f2716f31
2 changed files with 16 additions and 6 deletions

View File

@ -62,12 +62,22 @@ CopyInstanceDialog::~CopyInstanceDialog()
void CopyInstanceDialog::updateDialogState() void CopyInstanceDialog::updateDialogState()
{ {
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!instName().isEmpty()); auto allowOK = !instName().isEmpty();
auto OkButton = ui->buttonBox->button(QDialogButtonBox::Ok);
if(OkButton->isEnabled() != allowOK)
{
OkButton->setEnabled(allowOK);
}
} }
QString CopyInstanceDialog::instName() const QString CopyInstanceDialog::instName() const
{ {
return ui->instNameTextBox->text(); auto result = ui->instNameTextBox->text().trimmed();
if(result.size())
{
return result;
}
return QString();
} }
QString CopyInstanceDialog::iconKey() const QString CopyInstanceDialog::iconKey() const

View File

@ -165,15 +165,15 @@ void NewInstanceDialog::updateDialogState()
QString NewInstanceDialog::instName() const QString NewInstanceDialog::instName() const
{ {
auto result = ui->instNameTextBox->text(); auto result = ui->instNameTextBox->text().trimmed();
if(result.size()) if(result.size())
{ {
return result.trimmed(); return result;
} }
result = ui->instNameTextBox->placeholderText(); result = ui->instNameTextBox->placeholderText().trimmed();
if(result.size()) if(result.size())
{ {
return result.trimmed(); return result;
} }
return QString(); return QString();
} }