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

Qml JS Live Preview: Show warnings when running Live Preview

Browse Source 
Two kinds of warnings are now shown: one for warning about the Live
Preview itself, as it is experimental, and another when user changes
id's of objects during runtime, as this is not supported at the moment.

More warnings will be added later for other unsupported changes.
This commit is contained in:
Lasse Holmstedt
2010-07-30 15:28:05 +02:00
parent 07ac6bcaa4
commit 2c15b30a20
8 changed files with 104 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,12 @@
#include <typeinfo>
#include "qmljsinspector.h"
#include "qmljsclientproxy.h"
#include "qmljslivetextpreview.h"
#include "qmljsprivateapi.h"
#include "qmljsinspectorconstants.h"
#include <qmljseditor/qmljseditorconstants.h>
#include <qmljseditor/qmljseditor.h>
#include <qmljs/qmljsdelta.h>
@@ -430,6 +432,12 @@ protected:
virtual void updateScriptBinding(DebugId debugId, UiScriptBinding* scriptBinding,
const QString& propertyName, const QString& scriptCode)
{
if (propertyName == QLatin1String("id") && !hasUnsyncronizableChanges) {
hasUnsyncronizableChanges = true;
unsyncronizableChangeLine = scriptBinding->firstSourceLocation().startLine;
unsyncronizableChangeColumn = scriptBinding->firstSourceLocation().startColumn;
}
QVariant expr = scriptCode;
const bool isLiteral = isLiteralValue(scriptBinding);
if (isLiteral)
@@ -455,8 +463,12 @@ virtual void updateScriptBinding(DebugId debugId, UiScriptBinding* scriptBinding
}
public:
UpdateObserver() : referenceRefreshRequired(false) {}
UpdateObserver() : referenceRefreshRequired(false), hasUnsyncronizableChanges(false) {}
bool referenceRefreshRequired;
bool hasUnsyncronizableChanges;
unsigned unsyncronizableChangeLine;
unsigned unsyncronizableChangeColumn;
};
void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
@@ -470,9 +482,17 @@ void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
if (!core->hasContext(dbgcontext))
return;
bool experimentalWarningShown = false;
if (m_applyChangesToQmlObserver) {
m_docWithUnappliedChanges.clear();
if (Inspector::showExperimentalWarning()) {
showExperimentalWarning();
experimentalWarningShown = true;
Inspector::setShowExperimentalWarning(false);
}
if (doc && m_previousDoc && doc->fileName() == m_previousDoc->fileName()
&& doc->qmlProgram() && m_previousDoc->qmlProgram())
{
@@ -482,6 +502,9 @@ void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
if (delta.referenceRefreshRequired)
ClientProxy::instance()->refreshObjectTree();
if (delta.hasUnsyncronizableChanges && !experimentalWarningShown)
showSyncWarning(delta.unsyncronizableChangeLine, delta.unsyncronizableChangeColumn);
m_previousDoc = doc;
if (!delta.newObjects.isEmpty())
m_createdObjects[doc] += delta.newObjects;
@@ -491,6 +514,37 @@ void QmlJSLiveTextPreview::documentChanged(QmlJS::Document::Ptr doc)
}
}
void QmlJSLiveTextPreview::showExperimentalWarning()
{
Core::EditorManager *em = Core::EditorManager::instance();
em->showEditorInfoBar(Constants::INFO_EXPERIMENTAL,
tr("You changed a QML file in in Live Preview mode, and the changes were applied to the running QML application. "
"This feature is experimental, and behavior can be unexpected."),
tr("Disable Live Preview"), this, SLOT(disableLivePreview()));
}
void QmlJSLiveTextPreview::showSyncWarning(unsigned line, unsigned column)
{
Core::EditorManager *em = Core::EditorManager::instance();
em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC,
tr("The change at line %1, column %2 cannot be applied without reloading the QML application. "
"You can continue debugging, but behavior can be unexpected.").
arg(QString::number(line), QString::number(column)),
tr("Reload"), this, SLOT(reloadQmlViewer()));
}
void QmlJSLiveTextPreview::reloadQmlViewer()
{
Core::EditorManager::instance()->hideEditorInfoBar(Constants::INFO_OUT_OF_SYNC);
emit reloadQmlViewerRequested();
}
void QmlJSLiveTextPreview::disableLivePreview()
{
Core::EditorManager::instance()->hideEditorInfoBar(Constants::INFO_EXPERIMENTAL);
emit disableLivePreviewRequested();
}
void QmlJSLiveTextPreview::setApplyChangesToQmlObserver(bool applyChanges)
{
if (applyChanges && !m_applyChangesToQmlObserver) {