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

QmlJSDebugger: Renamed "execution paused" to "animation paused"

Browse Source 
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
This commit is contained in:
Thorbjørn Lindeijer
2011-03-22 10:37:14 +01:00
parent 0a813cd67c
commit a8bf2ba5e3
16 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}

4
src/plugins/qmljsinspector/qmlinspectortoolbar.h
View File

@@ -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();

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

@@ -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()

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

@@ -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();

8
src/plugins/qmljsinspector/qmljsinspector.cpp
View File

@@ -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()),

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

@@ -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;

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

@@ -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