From fdee97530ef0da68a11bf9a5ec54db03057b0f2d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 8 Oct 2010 11:05:06 +0200
Subject: [PATCH] QmlInspector: Remove "Reload" button
It only works together with qmlobserver. Making it disabled for .pro
file based projects would require some infrastructure.
Reviewed-by: Christiaan Janssen
---
src/plugins/qmljsinspector/qmlinspectortoolbar.cpp | 14 +++++++-------
src/plugins/qmljsinspector/qmlinspectortoolbar.h | 2 +-
.../qmljsinspector/qmljsinspectorconstants.h | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
index b74de20c485..a40c2afa7b6 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
@@ -59,7 +59,7 @@ static QToolButton *createToolButton(QAction *action)
QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) :
QObject(parent),
m_observerModeAction(0),
- m_reloadAction(0),
+// m_reloadAction(0),
m_playAction(0),
m_selectAction(0),
m_zoomAction(0),
@@ -91,7 +91,7 @@ void QmlInspectorToolbar::setEnabled(bool value)
//m_toQmlAction->setEnabled(value);
m_fromQmlAction->setEnabled(value);
- m_reloadAction->setEnabled(value);
+// m_reloadAction->setEnabled(value);
m_playAction->setEnabled(value);
m_selectAction->setEnabled(value);
m_zoomAction->setEnabled(value);
@@ -179,7 +179,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 on Save"), this);
- m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload QML"), this);
+// m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload QML"), this);
m_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
m_playAction = new QAction(m_pauseIcon, tr("Play/Pause Animations"), this);
@@ -198,7 +198,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
m_fromQmlAction->setChecked(true);
am->registerAction(m_observerModeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context);
- am->registerAction(m_reloadAction, QmlJSInspector::Constants::RELOAD_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);
am->registerAction(m_zoomAction, QmlJSInspector::Constants::ZOOM_ACTION, context);
@@ -248,7 +248,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
// configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::DEBUG)->action()));
// configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::STOP)->action()));
configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::FROM_QML_ACTION)->action()));
- configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::RELOAD_ACTION)->action()));
+// configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::RELOAD_ACTION)->action()));
configBarLayout->addSpacing(10);
configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::DESIGNMODE_ACTION)->action()));
@@ -278,7 +278,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
setEnabled(false);
connect(m_observerModeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick()));
- connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
+// connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
@@ -331,7 +331,7 @@ void QmlInspectorToolbar::activateDesignModeOnClick()
{
bool checked = m_observerModeAction->isChecked();
- m_reloadAction->setEnabled(true);
+// m_reloadAction->setEnabled(true);
m_playAction->setEnabled(checked);
m_selectAction->setEnabled(checked);
m_zoomAction->setEnabled(checked);
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index 31fa02f8604..09902706464 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -116,7 +116,7 @@ private slots:
private:
QAction *m_observerModeAction;
- QAction *m_reloadAction;
+// QAction *m_reloadAction;
QAction *m_playAction;
QAction *m_selectAction;
QAction *m_zoomAction;
diff --git a/src/plugins/qmljsinspector/qmljsinspectorconstants.h b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
index 049d8ac477c..0b376aaf76b 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorconstants.h
+++ b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
@@ -43,7 +43,7 @@ const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental";
const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning";
const char * const DESIGNMODE_ACTION = "QmlInspector.DesignMode";
-const char * const RELOAD_ACTION = "QmlInspector.Reload";
+//const char * const RELOAD_ACTION = "QmlInspector.Reload";
const char * const PLAY_ACTION = "QmlInspector.Play";
const char * const SELECT_ACTION = "QmlInspector.Select";
const char * const SELECT_MARQUEE_ACTION = "QmlInspector.SelectMarquee";
--
GitLab