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

QML Observer & Inspector: Improved toolbars

Browse Source 
Animation play/pause buttons are now merged on observer toolbar. Also, a
bugfix to inspector toolbar.
This commit is contained in:
Lasse Holmstedt
2010-08-24 18:40:57 +02:00
parent 9e8f6cf860
commit 65e79d0d51
4 changed files with 154 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,7 @@ void QmlInspectorToolbar::setAnimationSpeed(qreal slowdownFactor)
}
updatePlayAction();
} else {
m_menuPauseAction->setChecked(true);
updatePauseAction();
}
@@ -190,7 +191,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
m_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload"), this);
m_playAction = new QAction(m_playIcon, tr("Play animations"), this);
m_playAction = new QAction(m_pauseIcon, tr("Play/Pause Animations"), this);
m_selectAction = new QAction(QIcon(QLatin1String(":/qml/images/select-small.png")), tr("Select"), this);
m_selectMarqueeAction = new QAction(QIcon(QLatin1String(":/qml/images/select-marquee-small.png")), tr("Select (Marquee)"), this);
m_zoomAction = new QAction(QIcon(QLatin1String(":/qml/images/zoom-small.png")), tr("Zoom"), this);
@@ -366,7 +367,7 @@ void QmlInspectorToolbar::activatePlayOnClick()
void QmlInspectorToolbar::updatePlayAction()
{
m_isRunning = true;
m_playAction->setIcon(m_playIcon);
m_playAction->setIcon(m_pauseIcon);
if (m_animationSpeed != m_previousAnimationSpeed)
m_previousAnimationSpeed = m_animationSpeed;
@@ -379,7 +380,7 @@ void QmlInspectorToolbar::updatePlayAction()
void QmlInspectorToolbar::updatePauseAction()
{
m_isRunning = false;
m_playAction->setIcon(m_pauseIcon);
m_playAction->setIcon(m_playIcon);
if (m_emitSignals)
emit animationSpeedChanged(0.0f);