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

QmlInspector: Remove "Reload" button

Browse Source 
It only works together with qmlobserver. Making it disabled for .pro
file based projects would require some infrastructure.

Reviewed-by: Christiaan Janssen
This commit is contained in:
Kai Koehne
2010-10-08 11:05:06 +02:00
parent e81fa24807
commit fdee97530e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ static QToolButton *createToolButton(QAction *action)
QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) : QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) :
QObject(parent), QObject(parent),
m_observerModeAction(0), m_observerModeAction(0),
m_reloadAction(0), // m_reloadAction(0),
m_playAction(0), m_playAction(0),
m_selectAction(0), m_selectAction(0),
m_zoomAction(0), m_zoomAction(0),
@@ -91,7 +91,7 @@ void QmlInspectorToolbar::setEnabled(bool value)
//m_toQmlAction->setEnabled(value); //m_toQmlAction->setEnabled(value);
m_fromQmlAction->setEnabled(value); m_fromQmlAction->setEnabled(value);
m_reloadAction->setEnabled(value); // m_reloadAction->setEnabled(value);
m_playAction->setEnabled(value); m_playAction->setEnabled(value);
m_selectAction->setEnabled(value); m_selectAction->setEnabled(value);
m_zoomAction->setEnabled(value); m_zoomAction->setEnabled(value);
@@ -179,7 +179,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
Core::ActionManager *am = core->actionManager(); Core::ActionManager *am = core->actionManager();
m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes on Save"), this); 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_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
m_playAction = new QAction(m_pauseIcon, tr("Play/Pause Animations"), 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); m_fromQmlAction->setChecked(true);
am->registerAction(m_observerModeAction, 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_reloadAction, QmlJSInspector::Constants::RELOAD_ACTION, context);
am->registerAction(m_playAction, QmlJSInspector::Constants::PLAY_ACTION, context); am->registerAction(m_playAction, QmlJSInspector::Constants::PLAY_ACTION, context);
am->registerAction(m_selectAction, QmlJSInspector::Constants::SELECT_ACTION, context); am->registerAction(m_selectAction, QmlJSInspector::Constants::SELECT_ACTION, context);
am->registerAction(m_zoomAction, QmlJSInspector::Constants::ZOOM_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::DEBUG)->action()));
// configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::STOP)->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::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->addSpacing(10);
configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::DESIGNMODE_ACTION)->action())); configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::DESIGNMODE_ACTION)->action()));
@@ -278,7 +278,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
setEnabled(false); setEnabled(false);
connect(m_observerModeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick())); 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())); connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
@@ -331,7 +331,7 @@ void QmlInspectorToolbar::activateDesignModeOnClick()
{ {
bool checked = m_observerModeAction->isChecked(); bool checked = m_observerModeAction->isChecked();
m_reloadAction->setEnabled(true); // m_reloadAction->setEnabled(true);
m_playAction->setEnabled(checked); m_playAction->setEnabled(checked);
m_selectAction->setEnabled(checked); m_selectAction->setEnabled(checked);
m_zoomAction->setEnabled(checked); m_zoomAction->setEnabled(checked);

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

@@ -116,7 +116,7 @@ private slots:
private: private:
QAction *m_observerModeAction; QAction *m_observerModeAction;
QAction *m_reloadAction; // QAction *m_reloadAction;
QAction *m_playAction; QAction *m_playAction;
QAction *m_selectAction; QAction *m_selectAction;
QAction *m_zoomAction; QAction *m_zoomAction;

2
src/plugins/qmljsinspector/qmljsinspectorconstants.h
View File

@@ -43,7 +43,7 @@ const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental";
const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning"; const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning";
const char * const DESIGNMODE_ACTION = "QmlInspector.DesignMode"; 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 PLAY_ACTION = "QmlInspector.Play";
const char * const SELECT_ACTION = "QmlInspector.Select"; const char * const SELECT_ACTION = "QmlInspector.Select";
const char * const SELECT_MARQUEE_ACTION = "QmlInspector.SelectMarquee"; const char * const SELECT_MARQUEE_ACTION = "QmlInspector.SelectMarquee";