diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp index 942a6ada10ef08ebfc4f4b60337b89c474567d2d..41c98a06036ea3f707648eb1e1cce10fb5c274e2 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp @@ -195,7 +195,7 @@ void QmlToolBar::setAnimationSpeed(qreal slowDownFactor) m_emitSignals = true; } -void QmlToolBar::setExecutionPaused(bool paused) +void QmlToolBar::setAnimationPaused(bool paused) { if (m_paused == paused) return; @@ -240,7 +240,7 @@ void QmlToolBar::setColorBoxColor(const QColor &color) void QmlToolBar::activatePlayOnClick() { m_paused = !m_paused; - emit executionPausedChanged(m_paused); + emit animationPausedChanged(m_paused); updatePlayAction(); } diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h index de2186956b4a8d89e2781347e19e38951d7563b7..c2927ef4d6541b176d0c77eb7812c7653e1186c6 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h @@ -62,11 +62,11 @@ public slots: void activateZoom(); void setAnimationSpeed(qreal slowDownFactor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); signals: void animationSpeedChanged(qreal factor); - void executionPausedChanged(bool paused); + void animationPausedChanged(bool paused); void designModeBehaviorChanged(bool inDesignMode); void colorPickerSelected(); diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h index 29b641266ff12b139add24e90a1966b536f1785d..2259858deb125fdea2e8b6bfa38859be23b60f61 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h @@ -66,7 +66,7 @@ public: void setDesignModeBehavior(bool inDesignMode); void setCurrentObjects(QList<QObject*> items); void setAnimationSpeed(qreal slowDownFactor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); void setCurrentTool(QmlJSDebugger::Constants::DesignTool toolId); void reloaded(); void setShowAppOnTop(bool showAppOnTop); diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h index a20dca234a3f06e43de995b5a66051c67f4bce60..fc4ee84f711c426ec2eaee944dd1b1031bdb1a1f 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h @@ -74,7 +74,7 @@ public Q_SLOTS: void setShowAppOnTop(bool appOnTop); void setAnimationSpeed(qreal factor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); void setObserverContext(int contextIndex); @@ -89,7 +89,7 @@ Q_SIGNALS: void selectedColorChanged(const QColor &color); void animationSpeedChanged(qreal factor); - void executionPausedChanged(bool paused); + void animationPausedChanged(bool paused); void inspectorContextCleared(); void inspectorContextPushed(const QString &contextTitle); @@ -111,7 +111,7 @@ protected: private slots: void animationSpeedChangeRequested(qreal factor); - void executionPausedChangeRequested(bool paused); + void animationPausedChangeRequested(bool paused); private: Q_DISABLE_COPY(QDeclarativeViewObserver) diff --git a/share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h b/share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h index fde32fc2cb18d05e2b9387b0da1ca5094b060e66..b13880623ed4ba7a0d59fb76c9bc69281483a18b 100644 --- a/share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h +++ b/share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h @@ -49,7 +49,7 @@ class ObserverProtocol : public QObject public: enum Message { AnimationSpeedChanged = 0, - ExecutionPausedChanged = 19, // highest value + AnimationPausedChanged = 19, // highest value ChangeTool = 1, ClearComponentCache = 2, ColorChanged = 3, @@ -62,7 +62,7 @@ public: Reload = 10, Reloaded = 11, SetAnimationSpeed = 12, - SetExecutionPaused = 18, + SetAnimationPaused = 18, SetContextPathIdx = 13, SetCurrentObjects = 14, SetDesignMode = 15, diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp index e6f236f0dd2864a13335c6b71a8eb4561ee64fad..00a59d0f1d4b09e797b9846223d071e326bcdbe1 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp @@ -100,7 +100,7 @@ void QDeclarativeObserverService::messageReceived(const QByteArray &message) emit animationSpeedChangeRequested(speed); break; } - case ObserverProtocol::SetExecutionPaused: { + case ObserverProtocol::SetAnimationPaused: { bool paused; ds >> paused; emit executionPauseChangeRequested(paused); @@ -239,12 +239,12 @@ void QDeclarativeObserverService::setAnimationSpeed(qreal slowDownFactor) sendMessage(message); } -void QDeclarativeObserverService::setExecutionPaused(bool paused) +void QDeclarativeObserverService::setAnimationPaused(bool paused) { QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << ObserverProtocol::ExecutionPausedChanged + ds << ObserverProtocol::AnimationPausedChanged << paused; sendMessage(message); diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp index a32f094342902c72754fc6c7e42ef4f970378719..6bf346fb6adcbbac7cba96e3bf4fddaf3b3a5c80 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp @@ -105,7 +105,7 @@ QDeclarativeViewObserverPrivate::QDeclarativeViewObserverPrivate(QDeclarativeVie q(q), designModeBehavior(false), showAppOnTop(false), - executionPaused(false), + animationPaused(false), slowDownFactor(1.0f), toolBox(0) { @@ -149,7 +149,7 @@ QDeclarativeViewObserver::QDeclarativeViewObserver(QDeclarativeView *view, QObje connect(data->debugService, SIGNAL(animationSpeedChangeRequested(qreal)), SLOT(animationSpeedChangeRequested(qreal))); connect(data->debugService, SIGNAL(executionPauseChangeRequested(bool)), - SLOT(executionPausedChangeRequested(bool))); + SLOT(animationPausedChangeRequested(bool))); connect(data->debugService, SIGNAL(colorPickerToolRequested()), data.data(), SLOT(_q_changeToColorPickerTool())); connect(data->debugService, SIGNAL(selectMarqueeToolRequested()), @@ -386,7 +386,7 @@ bool QDeclarativeViewObserver::keyReleaseEvent(QKeyEvent *event) data->subcomponentEditorTool->setCurrentItem(data->selectedItems().first()); break; case Qt::Key_Space: - setExecutionPaused(!data->executionPaused); + setAnimationPaused(!data->animationPaused); break; default: break; @@ -765,13 +765,13 @@ void QDeclarativeViewObserver::setAnimationSpeed(qreal slowDownFactor) data->debugService->setAnimationSpeed(slowDownFactor); } -void QDeclarativeViewObserver::setExecutionPaused(bool paused) +void QDeclarativeViewObserver::setAnimationPaused(bool paused) { - if (data->executionPaused == paused) + if (data->animationPaused == paused) return; - executionPausedChangeRequested(paused); - data->debugService->setExecutionPaused(paused); + animationPausedChangeRequested(paused); + data->debugService->setAnimationPaused(paused); } void QDeclarativeViewObserver::animationSpeedChangeRequested(qreal factor) @@ -781,15 +781,15 @@ void QDeclarativeViewObserver::animationSpeedChangeRequested(qreal factor) emit animationSpeedChanged(factor); } - const float effectiveFactor = data->executionPaused ? 0 : factor; + const float effectiveFactor = data->animationPaused ? 0 : factor; QDeclarativeDebugHelper::setAnimationSlowDownFactor(effectiveFactor); } -void QDeclarativeViewObserver::executionPausedChangeRequested(bool paused) +void QDeclarativeViewObserver::animationPausedChangeRequested(bool paused) { - if (data->executionPaused != paused) { - data->executionPaused = paused; - emit executionPausedChanged(paused); + if (data->animationPaused != paused) { + data->animationPaused = paused; + emit animationPausedChanged(paused); } const float effectiveFactor = paused ? 0 : data->slowDownFactor; @@ -918,7 +918,7 @@ void QDeclarativeViewObserverPrivate::createToolBox() QObject::connect(toolBar, SIGNAL(designModeBehaviorChanged(bool)), q, SLOT(setDesignModeBehavior(bool))); QObject::connect(toolBar, SIGNAL(animationSpeedChanged(qreal)), q, SLOT(setAnimationSpeed(qreal))); - QObject::connect(toolBar, SIGNAL(executionPausedChanged(bool)), q, SLOT(setExecutionPaused(bool))); + QObject::connect(toolBar, SIGNAL(animationPausedChanged(bool)), q, SLOT(setAnimationPaused(bool))); QObject::connect(toolBar, SIGNAL(colorPickerSelected()), this, SLOT(_q_changeToColorPickerTool())); QObject::connect(toolBar, SIGNAL(zoomToolSelected()), this, SLOT(_q_changeToZoomTool())); QObject::connect(toolBar, SIGNAL(selectToolSelected()), this, SLOT(_q_changeToSingleSelectTool())); @@ -929,7 +929,7 @@ void QDeclarativeViewObserverPrivate::createToolBox() this, SLOT(_q_applyChangesFromClient())); QObject::connect(q, SIGNAL(animationSpeedChanged(qreal)), toolBar, SLOT(setAnimationSpeed(qreal))); - QObject::connect(q, SIGNAL(executionPausedChanged(bool)), toolBar, SLOT(setExecutionPaused(bool))); + QObject::connect(q, SIGNAL(animationPausedChanged(bool)), toolBar, SLOT(setAnimationPaused(bool))); QObject::connect(q, SIGNAL(selectToolActivated()), toolBar, SLOT(activateSelectTool())); diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h index 7ed1103a7c8551021fe7579bd6ffffbace4fc16a..9e64e69326229233325e3254b61874022e122d6b 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h @@ -88,7 +88,7 @@ public: bool designModeBehavior; bool showAppOnTop; - bool executionPaused; + bool animationPaused; qreal slowDownFactor; ToolBox *toolBox; diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp index a21318ed818d86ac384f0e8d41b96b968cc732e5..e86e96e9a6f4401b9273eb5acf843c69d8320b49 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp @@ -787,7 +787,7 @@ void QDeclarativeViewer::createMenu() speedAction->setData(10.0f); playSpeedMenuActions->addAction(speedAction); - pauseAnimationsAction = playSpeedMenu->addAction(tr("Pause"), observer, SLOT(setExecutionPaused(bool))); + pauseAnimationsAction = playSpeedMenu->addAction(tr("Pause"), observer, SLOT(setAnimationPaused(bool))); pauseAnimationsAction->setCheckable(true); pauseAnimationsAction->setShortcut(QKeySequence("Ctrl+.")); @@ -801,7 +801,7 @@ void QDeclarativeViewer::createMenu() playSpeedAction->setMenu(playSpeedMenu); connect(observer, SIGNAL(animationSpeedChanged(qreal)), SLOT(animationSpeedChanged(qreal))); - connect(observer, SIGNAL(executionPausedChanged(bool)), pauseAnimationsAction, SLOT(setChecked(bool))); + connect(observer, SIGNAL(animationPausedChanged(bool)), pauseAnimationsAction, SLOT(setChecked(bool))); showWarningsWindow = new QAction(tr("Show Warnings"), this); showWarningsWindow->setCheckable((true)); @@ -1080,12 +1080,12 @@ void QDeclarativeViewer::toggleRecording() void QDeclarativeViewer::pauseAnimations() { - observer->setExecutionPaused(true); + observer->setAnimationPaused(true); } void QDeclarativeViewer::stepAnimations() { - observer->setExecutionPaused(false); + observer->setAnimationPaused(false); QTimer::singleShot(m_stepSize, this, SLOT(pauseAnimations())); } diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp index d33dd8e7ea2f84635551978574bf5af56ae89227..89ee15bd6aeee1f13b2faa01dc8de9c8288aeab7 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp @@ -154,7 +154,7 @@ void QmlInspectorToolBar::setAnimationSpeed(qreal slowDownFactor) m_emitSignals = true; } -void QmlInspectorToolBar::setExecutionPaused(bool paused) +void QmlInspectorToolBar::setAnimationPaused(bool paused) { if (m_paused == paused) return; @@ -338,7 +338,7 @@ void QmlInspectorToolBar::activateDesignModeOnClick() void QmlInspectorToolBar::activatePlayOnClick() { m_paused = !m_paused; - emit executionPausedChanged(m_paused); + emit animationPausedChanged(m_paused); updatePlayAction(); } diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h index 9ead3bc47fd3fcc09f2c8a556066b2cd47bd8823..545c6149ae9298ba27d7a7bbc0698dd9af7ab330 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h @@ -87,7 +87,7 @@ public slots: void activateZoomTool(); void setAnimationSpeed(qreal slowDownFactor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); void setDesignModeBehavior(bool inDesignMode); void setShowAppOnTop(bool showAppOnTop); @@ -105,7 +105,7 @@ signals: void showAppOnTopSelected(bool isChecked); void animationSpeedChanged(qreal slowdownFactor); - void executionPausedChanged(bool paused); + void animationPausedChanged(bool paused); private slots: void activateDesignModeOnClick(); diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 80c117cea619bf026e6030de09358b40a544bfeb..296d39af90b95bbe6faeefc94b51239594e95b57 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -86,8 +86,8 @@ void ClientProxy::connectToServer() SIGNAL(selectMarqueeToolActivated())); connect(m_observerClient, SIGNAL(animationSpeedChanged(qreal)), SIGNAL(animationSpeedChanged(qreal))); - connect(m_observerClient, SIGNAL(executionPausedChanged(bool)), - SIGNAL(executionPausedChanged(bool))); + connect(m_observerClient, SIGNAL(animationPausedChanged(bool)), + SIGNAL(animationPausedChanged(bool))); connect(m_observerClient, SIGNAL(designModeBehaviorChanged(bool)), SIGNAL(designModeBehaviorChanged(bool))); connect(m_observerClient, SIGNAL(showAppOnTopChanged(bool)), @@ -553,10 +553,10 @@ void ClientProxy::setAnimationSpeed(qreal slowDownFactor) m_observerClient->setAnimationSpeed(slowDownFactor); } -void ClientProxy::setExecutionPaused(bool paused) +void ClientProxy::setAnimationPaused(bool paused) { if (isConnected()) - m_observerClient->setExecutionPaused(paused); + m_observerClient->setAnimationPaused(paused); } void ClientProxy::changeToColorPickerTool() diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h index b6ee5ddd0088038b3ae7dcd7b9d921c9a7f4a729..191b69b4a2fb1591b4212fce77987d0507595fb4 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.h +++ b/src/plugins/qmljsinspector/qmljsclientproxy.h @@ -107,7 +107,7 @@ signals: void selectMarqueeToolActivated(); void zoomToolActivated(); void animationSpeedChanged(qreal slowDownFactor); - void executionPausedChanged(bool paused); + void animationPausedChanged(bool paused); void designModeBehaviorChanged(bool inDesignMode); void showAppOnTopChanged(bool showAppOnTop); void serverReloaded(); @@ -122,7 +122,7 @@ public slots: void setDesignModeBehavior(bool inDesignMode); void setAnimationSpeed(qreal slowDownFactor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); void changeToColorPickerTool(); void changeToZoomTool(); void changeToSelectTool(); diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index f1e01395101ef5f7d4496bd5dcb5c913dca9ed21..dc9f2df203d6cf3b76255a202c986b6d49ae71c8 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -884,8 +884,8 @@ void InspectorUi::connectSignals() m_toolBar, SLOT(setSelectedColor(QColor))); connect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolBar, SLOT(setAnimationSpeed(qreal))); - connect(m_clientProxy, SIGNAL(executionPausedChanged(bool)), - m_toolBar, SLOT(setExecutionPaused(bool))); + connect(m_clientProxy, SIGNAL(animationPausedChanged(bool)), + m_toolBar, SLOT(setAnimationPaused(bool))); connect(m_toolBar, SIGNAL(applyChangesFromQmlFileTriggered(bool)), this, SLOT(setApplyChangesToQmlObserver(bool))); @@ -896,8 +896,8 @@ void InspectorUi::connectSignals() m_clientProxy, SLOT(reloadQmlViewer())); connect(m_toolBar, SIGNAL(animationSpeedChanged(qreal)), m_clientProxy, SLOT(setAnimationSpeed(qreal))); - connect(m_toolBar, SIGNAL(executionPausedChanged(bool)), - m_clientProxy, SLOT(setExecutionPaused(bool))); + connect(m_toolBar, SIGNAL(animationPausedChanged(bool)), + m_clientProxy, SLOT(setAnimationPaused(bool))); connect(m_toolBar, SIGNAL(colorPickerSelected()), m_clientProxy, SLOT(changeToColorPickerTool())); connect(m_toolBar, SIGNAL(zoomToolSelected()), diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.cpp b/src/plugins/qmljsinspector/qmljsobserverclient.cpp index 8068f447165910efb8f7bf21a8e4d3417d244b5d..a61ccc35323a3b78f25e46ac9dff6c14b7062630 100644 --- a/src/plugins/qmljsinspector/qmljsobserverclient.cpp +++ b/src/plugins/qmljsinspector/qmljsobserverclient.cpp @@ -114,13 +114,13 @@ void QmlJSObserverClient::messageReceived(const QByteArray &message) emit animationSpeedChanged(slowDownFactor); break; } - case ObserverProtocol::ExecutionPausedChanged: { + case ObserverProtocol::AnimationPausedChanged: { bool paused; ds >> paused; log(LogReceive, type, paused ? QLatin1String("true") : QLatin1String("false")); - emit executionPausedChanged(paused); + emit animationPausedChanged(paused); break; } case ObserverProtocol::SetDesignMode: { @@ -318,7 +318,7 @@ void QmlJSObserverClient::setAnimationSpeed(qreal slowDownFactor) sendMessage(message); } -void QmlJSObserverClient::setExecutionPaused(bool paused) +void QmlJSObserverClient::setAnimationPaused(bool paused) { if (!m_connection || !m_connection->isConnected()) return; @@ -326,7 +326,7 @@ void QmlJSObserverClient::setExecutionPaused(bool paused) QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ObserverProtocol::Message cmd = ObserverProtocol::SetExecutionPaused; + ObserverProtocol::Message cmd = ObserverProtocol::SetAnimationPaused; ds << cmd << paused; diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.h b/src/plugins/qmljsinspector/qmljsobserverclient.h index 5dd30d97b78ee8ec8fef2c99a0eaec0e8b77ba9a..e0259eab14b5e12a96e1f875ef11ec615feee88e 100644 --- a/src/plugins/qmljsinspector/qmljsobserverclient.h +++ b/src/plugins/qmljsinspector/qmljsobserverclient.h @@ -60,7 +60,7 @@ public: void reloadViewer(); void setDesignModeBehavior(bool inDesignMode); void setAnimationSpeed(qreal slowDownFactor); - void setExecutionPaused(bool paused); + void setAnimationPaused(bool paused); void changeToColorPickerTool(); void changeToSelectTool(); void changeToSelectMarqueeTool(); @@ -93,7 +93,7 @@ signals: void selectMarqueeToolActivated(); void zoomToolActivated(); void animationSpeedChanged(qreal slowdownFactor); - void executionPausedChanged(bool paused); + void animationPausedChanged(bool paused); void designModeBehaviorChanged(bool inDesignMode); void showAppOnTopChanged(bool showAppOnTop); void reloaded(); // the server has reloadetd he document