kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Improve DlgAddPropertyVarSet

Browse Source 
* Give user a hint about the reason of an invalid name. Fixes issue 21111
* Fix isTypeValid() to check for valid property type
This commit is contained in:
wmayer
2025-05-03 22:34:22 +02:00
committed by Ladislav Michl
parent a124ce4f8f
commit 2aba143df1
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Gui/Dialogs/DlgAddPropertyVarSet.cpp
View File

@@ -371,8 +371,7 @@ bool DlgAddPropertyVarSet::isGroupValid()
bool DlgAddPropertyVarSet::isTypeValid()
{
std::string type = ui->comboBoxType->currentText().toStdString();
return !Base::Type::fromName(type.c_str()).isBad();
return Base::Type::fromName(type.c_str()).isDerivedFrom(App::Property::getClassTypeId());
}
bool DlgAddPropertyVarSet::areFieldsValid()
@@ -380,9 +379,41 @@ bool DlgAddPropertyVarSet::areFieldsValid()
return isNameValid() && isGroupValid() && isTypeValid();
}
void DlgAddPropertyVarSet::onTextFieldChanged([[maybe_unused]] const QString& text)
void DlgAddPropertyVarSet::onTextFieldChanged([[maybe_unused]]const QString& text)
{
setOkEnabled(areFieldsValid());
showStatusMessage();
}
void DlgAddPropertyVarSet::showStatusMessage()
{
QString error;
QString text = ui->lineEditName->text();
std::string name = text.toStdString();
if (!isGroupValid()) {
error = tr("Invalid group name");
}
else if (!isTypeValid()) {
error = tr("Invalid type name");
}
else if (name.empty()) {
error.clear();
}
else if (name != Base::Tools::getIdentifier(name)) {
error = tr("Invalid property name '%1'").arg(text);
}
else if (propertyExists(name)) {
error = tr("Property '%1' already exists").arg(text);
}
else if (App::ExpressionParser::isTokenAConstant(name)) {
error = tr("'%1' is a constant").arg(text);
}
else if (App::ExpressionParser::isTokenAUnit(name)) {
error = tr("'%1' is a unit").arg(text);
}
ui->labelError->setText(error);
}
void DlgAddPropertyVarSet::removeEditor()
@@ -409,6 +440,7 @@ void DlgAddPropertyVarSet::onTypeChanged(const QString& text)
}
setOkEnabled(areFieldsValid());
showStatusMessage();
}
void DlgAddPropertyVarSet::changeEvent(QEvent* e)