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

QmlJS Live Preview: Implemented "Apply changes from Qml File" button

Browse Source 
The button is checkable and pressing it will stop/propagate changes to
the qml application being debugged.
This commit is contained in:
Lasse Holmstedt
2010-07-26 11:59:59 +02:00
parent 70f2243bde
commit c7a8d93765
7 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/qmljsinspector/qmljslivetextpreview.cpp
View File

@@ -164,7 +164,7 @@ void QmlJSLiveTextPreview::unassociateEditor(Core::IEditor *oldEditor)
}
QmlJSLiveTextPreview::QmlJSLiveTextPreview(const QmlJS::Document::Ptr &doc, const QmlJS::Document::Ptr &initDoc, QObject* parent) :
QObject(parent), m_previousDoc(doc), m_initialDoc(initDoc)
QObject(parent), m_previousDoc(doc), m_initialDoc(initDoc), m_applyChangesToQmlObserver(true)
{
Q_ASSERT(doc->fileName() == initDoc->fileName());
ClientProxy *clientProxy = ClientProxy::instance();
@@ -184,6 +184,7 @@ void QmlJSLiveTextPreview::resetInitialDoc(const QmlJS::Document::Ptr &doc)
m_previousDoc = doc;
m_createdObjects.clear();
m_debugIds.clear();
m_docWithUnappliedChanges.clear();
}
@@ -462,20 +463,38 @@ void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
if (!core->hasContext(dbgcontext))
return;
if (doc && m_previousDoc && doc->fileName() == m_previousDoc->fileName()
&& doc->qmlProgram() && m_previousDoc->qmlProgram())
{
UpdateObserver delta;
m_debugIds = delta(m_previousDoc, doc, m_debugIds);
if (m_applyChangesToQmlObserver) {
m_docWithUnappliedChanges.clear();
if (delta.referenceRefreshRequired)
ClientProxy::instance()->refreshObjectTree();
if (doc && m_previousDoc && doc->fileName() == m_previousDoc->fileName()
&& doc->qmlProgram() && m_previousDoc->qmlProgram())
{
UpdateObserver delta;
m_debugIds = delta(m_previousDoc, doc, m_debugIds);
m_previousDoc = doc;
if (!delta.newObjects.isEmpty())
m_createdObjects[doc] += delta.newObjects;
if (delta.referenceRefreshRequired)
ClientProxy::instance()->refreshObjectTree();
m_previousDoc = doc;
if (!delta.newObjects.isEmpty())
m_createdObjects[doc] += delta.newObjects;
}
} else {
m_docWithUnappliedChanges = doc;
}
}
void QmlJSLiveTextPreview::setApplyChangesToQmlObserver(bool applyChanges)
{
if (applyChanges && !m_applyChangesToQmlObserver) {
if (m_docWithUnappliedChanges) {
m_applyChangesToQmlObserver = true;
documentChanged(m_docWithUnappliedChanges);
}
}
m_applyChangesToQmlObserver = applyChanges;
}
} // namespace Internal
} // namespace QmlJSInspector