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

QmlLivePreview: removing and inserting animations and transitions

Browse Source 
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2011-05-24 11:40:17 +02:00
committed by Kai Koehne
parent 779fafcbfe
commit 3cf5379380
11 changed files with 112 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljsinspector/qmljsclientproxy.cpp
View File

@@ -581,10 +581,10 @@ void ClientProxy::showAppOnTop(bool showOnTop)
}
void ClientProxy::createQmlObject(const QString &qmlText, int parentDebugId,
const QStringList &imports, const QString &filename)
const QStringList &imports, const QString &filename, int order)
{
if (isConnected())
m_observerClient->createQmlObject(qmlText, parentDebugId, imports, filename);
m_observerClient->createQmlObject(qmlText, parentDebugId, imports, filename, order);
}
void ClientProxy::destroyQmlObject(int debugId)

2
src/plugins/qmljsinspector/qmljsclientproxy.h
View File

@@ -130,7 +130,7 @@ public slots:
void changeToSelectMarqueeTool();
void showAppOnTop(bool showOnTop);
void createQmlObject(const QString &qmlText, int parentDebugId,
const QStringList &imports, const QString &filename = QString());
const QStringList &imports, const QString &filename = QString(), int order = 0);
void destroyQmlObject(int debugId);
void reparentQmlObject(int debugId, int newParent);
void setContextPathIndex(int contextIndex);

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

@@ -480,11 +480,11 @@ protected:
}
virtual void createObject(const QString& qmlText, DebugId ref,
const QStringList& importList, const QString& filename)
const QStringList& importList, const QString& filename, int order)
{
appliedChangesToViewer = true;
referenceRefreshRequired = true;
m_clientProxy->createQmlObject(qmlText, ref, importList, filename);
m_clientProxy->createQmlObject(qmlText, ref, importList, filename, order);
}
virtual void reparentObject(int debugId, int newParent)

5
src/plugins/qmljsinspector/qmljsobserverclient.cpp
View File

@@ -414,7 +414,7 @@ void QmlJSObserverClient::showAppOnTop(bool showOnTop)
}
void QmlJSObserverClient::createQmlObject(const QString &qmlText, int parentDebugId,
const QStringList &imports, const QString &filename)
const QStringList &imports, const QString &filename, int order)
{
if (!m_connection || !m_connection->isConnected())
return;
@@ -427,7 +427,8 @@ void QmlJSObserverClient::createQmlObject(const QString &qmlText, int parentDebu
<< qmlText
<< parentDebugId
<< imports
<< filename;
<< filename
<< order;
log(LogSend, cmd, QString("%1 %2 [%3] %4").arg(qmlText, QString::number(parentDebugId),
imports.join(","), filename));

2
src/plugins/qmljsinspector/qmljsobserverclient.h
View File

@@ -58,7 +58,7 @@ public:
void showAppOnTop(bool showOnTop);
void createQmlObject(const QString &qmlText, int parentDebugId,
const QStringList &imports, const QString &filename);
const QStringList &imports, const QString &filename, int order);
void destroyQmlObject(int debugId);
void reparentQmlObject(int debugId, int newParent);