diff --git a/share/qtcreator/qmljsdebugger/editor/editor.qrc b/share/qtcreator/qmljsdebugger/editor/editor.qrc index 09fc2f6fb01..77744d57bb4 100644 --- a/share/qtcreator/qmljsdebugger/editor/editor.qrc +++ b/share/qtcreator/qmljsdebugger/editor/editor.qrc @@ -8,11 +8,9 @@ images/pause.png images/from-qml.png images/to-qml.png - images/designmode.png images/color-picker-hicontrast.png images/zoom.png images/color-picker-24.png - images/designmode-24.png images/from-qml-24.png images/pause-24.png images/play-24.png @@ -20,5 +18,7 @@ images/zoom-24.png images/select-24.png images/select-marquee-24.png + images/observermode.png + images/observermode-24.png diff --git a/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png b/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png deleted file mode 100644 index b4e0ff43ff7..00000000000 Binary files a/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png and /dev/null differ diff --git a/share/qtcreator/qmljsdebugger/editor/images/observermode-24.png b/share/qtcreator/qmljsdebugger/editor/images/observermode-24.png new file mode 100644 index 00000000000..5e74d867c0a Binary files /dev/null and b/share/qtcreator/qmljsdebugger/editor/images/observermode-24.png differ diff --git a/share/qtcreator/qmljsdebugger/editor/images/designmode.png b/share/qtcreator/qmljsdebugger/editor/images/observermode.png similarity index 76% rename from share/qtcreator/qmljsdebugger/editor/images/designmode.png rename to share/qtcreator/qmljsdebugger/editor/images/observermode.png index b6a95e77bc2..daed21c9448 100644 Binary files a/share/qtcreator/qmljsdebugger/editor/images/designmode.png and b/share/qtcreator/qmljsdebugger/editor/images/observermode.png differ diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp index 585996a80cb..97f674da9b7 100644 --- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp +++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp @@ -15,7 +15,7 @@ QmlToolbar::QmlToolbar(QWidget *parent) : m_isRunning(false), ui(new Ui) { - ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/designmode-24.png")), tr("Design Mode"), this); + ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/observermode-24.png")), tr("Observer Mode"), this); ui->play = new QAction(QIcon(QLatin1String(":/qml/images/play-24.png")), tr("Play"), this); ui->pause = new QAction(QIcon(QLatin1String(":/qml/images/pause-24.png")), tr("Pause"), this); ui->select = new QAction(QIcon(QLatin1String(":/qml/images/select-24.png")), tr("Select"), this); diff --git a/src/plugins/qmljsinspector/images/designmode.png b/src/plugins/qmljsinspector/images/observermode.png similarity index 76% rename from src/plugins/qmljsinspector/images/designmode.png rename to src/plugins/qmljsinspector/images/observermode.png index b6a95e77bc2..daed21c9448 100644 Binary files a/src/plugins/qmljsinspector/images/designmode.png and b/src/plugins/qmljsinspector/images/observermode.png differ diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp index a63fa116da5..688f63d0368 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp @@ -58,7 +58,7 @@ static QToolButton *createToolButton(QAction *action) QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) : QObject(parent), - m_designmodeAction(0), + m_observerModeAction(0), m_reloadAction(0), m_playAction(0), m_selectAction(0), @@ -88,7 +88,7 @@ QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) : void QmlInspectorToolbar::setEnabled(bool value) { - m_designmodeAction->setEnabled(value); + m_observerModeAction->setEnabled(value); //m_toQmlAction->setEnabled(value); m_fromQmlAction->setEnabled(value); @@ -107,7 +107,7 @@ void QmlInspectorToolbar::enable() { setEnabled(true); m_emitSignals = false; - m_designmodeAction->setChecked(false); + m_observerModeAction->setChecked(false); setAnimationSpeed(1.0f); activateDesignModeOnClick(); m_emitSignals = true; @@ -176,7 +176,7 @@ void QmlInspectorToolbar::setAnimationSpeed(qreal slowdownFactor) void QmlInspectorToolbar::setDesignModeBehavior(bool inDesignMode) { m_emitSignals = false; - m_designmodeAction->setChecked(inDesignMode); + m_observerModeAction->setChecked(inDesignMode); activateDesignModeOnClick(); m_emitSignals = true; } @@ -187,7 +187,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context) Core::ActionManager *am = core->actionManager(); m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes to Document"), this); - m_designmodeAction = new QAction(QIcon(QLatin1String(":/qml/images/designmode.png")), tr("Design Mode"), this); + 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); @@ -197,8 +197,8 @@ void QmlInspectorToolbar::createActions(const Core::Context &context) m_colorPickerAction = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small.png")), tr("Color Picker"), this); m_toQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/to-qml-small.png")), tr("Live Preview Changes in QML Viewer"), this); - m_designmodeAction->setCheckable(true); - m_designmodeAction->setChecked(false); + m_observerModeAction->setCheckable(true); + m_observerModeAction->setChecked(false); m_selectAction->setCheckable(true); m_selectMarqueeAction->setCheckable(true); m_zoomAction->setCheckable(true); @@ -207,7 +207,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context) m_fromQmlAction->setCheckable(true); m_fromQmlAction->setChecked(true); - am->registerAction(m_designmodeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context); + am->registerAction(m_observerModeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context); am->registerAction(m_reloadAction, QmlJSInspector::Constants::RELOAD_ACTION, context); am->registerAction(m_playAction, QmlJSInspector::Constants::PLAY_ACTION, context); am->registerAction(m_selectAction, QmlJSInspector::Constants::SELECT_ACTION, context); @@ -288,7 +288,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context) setEnabled(false); - connect(m_designmodeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick())); + connect(m_observerModeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick())); connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected())); connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick())); @@ -341,7 +341,7 @@ void QmlInspectorToolbar::changeToTenthAnimSpeed() void QmlInspectorToolbar::activateDesignModeOnClick() { - bool checked = m_designmodeAction->isChecked(); + bool checked = m_observerModeAction->isChecked(); m_reloadAction->setEnabled(true); m_playAction->setEnabled(checked); diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h index 9d2d4165fc9..b4e9e253820 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h @@ -118,7 +118,7 @@ private slots: void updatePauseAction(); private: - QAction *m_designmodeAction; + QAction *m_observerModeAction; QAction *m_reloadAction; QAction *m_playAction; QAction *m_selectAction;