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

Fix bug where a qml error shown in Design mode were not updated

Browse Source 
If you continue to fix qml errors in text mode, but still had errors,
the error message you got in the Design mode always stayed the first
(outdated) error message.
This commit is contained in:
Kai Koehne
2010-01-08 13:15:52 +01:00
parent a22e64a093
commit 2a425c7cfa
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/core/include/rewriterview.h
View File

@@ -137,7 +137,7 @@ public:
QList<Error> errors() const; QList<Error> errors() const;
void clearErrors(); void clearErrors();
void addErrors(const QList<Error> &errors); void setErrors(const QList<Error> &errors);
void addError(const Error &error); void addError(const Error &error);
QMap<ModelNode, QString> extractText(const QList<ModelNode> &nodes) const; QMap<ModelNode, QString> extractText(const QList<ModelNode> &nodes) const;

4
src/plugins/qmldesigner/core/model/rewriterview.cpp
View File

@@ -376,9 +376,9 @@ void RewriterView::clearErrors()
emit errorsChanged(m_errors); emit errorsChanged(m_errors);
} }
void RewriterView::addErrors(const QList<RewriterView::Error> &errors) void RewriterView::setErrors(const QList<RewriterView::Error> &errors)
{ {
m_errors.append(errors); m_errors = errors;
emit errorsChanged(m_errors); emit errorsChanged(m_errors);
} }

2
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
View File

@@ -104,7 +104,7 @@ bool TextToModelMerger::load(const QByteArray &data, DifferenceHandler &differen
QList<RewriterView::Error> errors; QList<RewriterView::Error> errors;
foreach (const QmlError &qmlError, doc.errors()) foreach (const QmlError &qmlError, doc.errors())
errors.append(RewriterView::Error(qmlError)); errors.append(RewriterView::Error(qmlError));
m_rewriterView->addErrors(errors); m_rewriterView->setErrors(errors);
} }
setActive(false); setActive(false);

26
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -281,27 +281,30 @@ void DocumentWidget::setAutoSynchronization(bool sync)
if (sync) { if (sync) {
// text editor -> visual editor // text editor -> visual editor
if (!m_document->model()) { if (!document()->model()) {
QList<RewriterView::Error> errors = m_document->loadMaster(m_textBuffer.data()); // first initialization
QList<RewriterView::Error> errors = document()->loadMaster(m_textBuffer.data());
if (!errors.isEmpty()) { if (!errors.isEmpty()) {
disable(errors); disable(errors);
} else {
connect(m_document, SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>)),
this, SLOT(updateErrorStatus(QList<RewriterView::Error>)));
} }
} }
if (m_document->model() && m_document->qmlErrors().isEmpty()) { if (document()->model() && document()->qmlErrors().isEmpty()) {
// set selection to text cursor // set selection to text cursor
RewriterView *rewriter = m_document->rewriterView(); RewriterView *rewriter = document()->rewriterView();
const int cursorPos = m_textBuffer->textCursor().position(); const int cursorPos = m_textBuffer->textCursor().position();
ModelNode node = nodeForPosition(cursorPos); ModelNode node = nodeForPosition(cursorPos);
if (node.isValid()) { if (node.isValid()) {
rewriter->setSelectedModelNodes(QList<ModelNode>() << node); rewriter->setSelectedModelNodes(QList<ModelNode>() << node);
} }
enable();
} }
connect(document(), SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>)),
this, SLOT(updateErrorStatus(QList<RewriterView::Error>)));
} else { } else {
if (m_document->model() && m_document->qmlErrors().isEmpty()) { if (document()->model() && document()->qmlErrors().isEmpty()) {
RewriterView *rewriter = m_document->rewriterView(); RewriterView *rewriter = document()->rewriterView();
// visual editor -> text editor // visual editor -> text editor
ModelNode selectedNode; ModelNode selectedNode;
if (!rewriter->selectedModelNodes().isEmpty()) if (!rewriter->selectedModelNodes().isEmpty())
@@ -319,6 +322,9 @@ void DocumentWidget::setAutoSynchronization(bool sync)
} }
} }
} }
disconnect(document(), SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>)),
this, SLOT(updateErrorStatus(QList<RewriterView::Error>)));
} }
} }
@@ -350,7 +356,7 @@ void DocumentWidget::updateErrorStatus(const QList<RewriterView::Error> &errors)
{ {
if (m_isDisabled && errors.isEmpty()) { if (m_isDisabled && errors.isEmpty()) {
enable(); enable();
} else if (!m_isDisabled && !errors.isEmpty()) { } else if (!errors.isEmpty()) {
disable(errors); disable(errors);
} }
} }