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

8
share/qtcreator/qml/qmlobserver/qmlruntime.cpp
View File

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