feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Properly reset line edits if an error occurs

Browse Source 
Task-number: QDS-707
Change-Id: Ic70c4296afd8bd6b590242fea129624af2fee7a6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2019-05-22 10:23:34 +02:00
parent 8aa227a778
commit fd24586421
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.cpp
View File

@@ -85,14 +85,23 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
if (newId == animation().id())
return;
if (!animation().isValidId(newId)) {
bool error = false;
if (!ModelNode::isValidId(newId)) {
Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
tr("%1 is an invalid id.").arg(newId));
error = true;
} else if (animation().view()->hasId(newId)) {
Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
tr("%1 already exists.").arg(newId));
} else {
animation().setIdWithRefactoring(newId);
error = true;
}
if (error) {
lastString.clear();
ui->idLineEdit->setText(animation().id());
}
});

11
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.cpp
View File

@@ -98,15 +98,24 @@ TimelineForm::TimelineForm(QWidget *parent)
if (newId == m_timeline.modelNode().id())
return;
if (!m_timeline.modelNode().isValidId(newId)) {
bool error = false;
if (!ModelNode::isValidId(newId)) {
Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
tr("%1 is an invalid id.").arg(newId));
error = true;
} else if (m_timeline.view()->hasId(newId)) {
Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
tr("%1 already exists.").arg(newId));
error = true;
} else {
m_timeline.modelNode().setIdWithRefactoring(newId);
}
if (error) {
lastString.clear();
ui->idLineEdit->setText(m_timeline.modelNode().id());
}
});
connectSpinBox(ui->startFrame, "startFrame");