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

connected reloading signals

Browse Source
This commit is contained in:
Lasse Holmstedt
2010-07-08 12:30:08 +02:00
parent 9a81759101
commit 7e67880ef7
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,8 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
uiSwitcher->setToolbar(QmlJSInspector::Constants::LANG_QML, configBar); uiSwitcher->setToolbar(QmlJSInspector::Constants::LANG_QML, configBar);
setEnabled(false); setEnabled(false);
connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick())); connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
connect(m_playAction, SIGNAL(triggered()), SLOT(activatePlayOnClick())); connect(m_playAction, SIGNAL(triggered()), SLOT(activatePlayOnClick()));

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

@@ -43,6 +43,7 @@ public slots:
signals: signals:
void animationSpeedChanged(qreal slowdownFactor = 1.0f); void animationSpeedChanged(qreal slowdownFactor = 1.0f);
void reloadSelected();
void colorPickerSelected(); void colorPickerSelected();
void selectToolSelected(); void selectToolSelected();
void marqueeSelectToolSelected(); void marqueeSelectToolSelected();

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

@@ -85,9 +85,6 @@
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
#include <QtGui/QToolButton>
#include <QtGui/QToolBar>
#include <QtGui/QBoxLayout>
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QDockWidget> #include <QtGui/QDockWidget>
#include <QtGui/QAction> #include <QtGui/QAction>
@@ -128,6 +125,10 @@ Inspector::Inspector(QObject *parent)
m_textPreview = new QmlJSLiveTextPreview(this); m_textPreview = new QmlJSLiveTextPreview(this);
connect(m_textPreview,
SIGNAL(selectedItemsChanged(QList<QDeclarativeDebugObjectReference>)),
SLOT(changeSelectedItems(QList<QDeclarativeDebugObjectReference>)));
connect(m_clientProxy, SIGNAL(selectedItemsChanged(QList<QDeclarativeDebugObjectReference>)), connect(m_clientProxy, SIGNAL(selectedItemsChanged(QList<QDeclarativeDebugObjectReference>)),
SLOT(setSelectedItemsByObjectReference(QList<QDeclarativeDebugObjectReference>))); SLOT(setSelectedItemsByObjectReference(QList<QDeclarativeDebugObjectReference>)));

1
src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
View File

@@ -165,6 +165,7 @@ void InspectorPlugin::extensionsInitialized()
connect(_clientProxy, SIGNAL(connected(QDeclarativeEngineDebug*)), m_toolbar, SLOT(enable())); connect(_clientProxy, SIGNAL(connected(QDeclarativeEngineDebug*)), m_toolbar, SLOT(enable()));
connect(_clientProxy, SIGNAL(disconnected()), m_toolbar, SLOT(disable())); connect(_clientProxy, SIGNAL(disconnected()), m_toolbar, SLOT(disable()));
connect(m_toolbar, SIGNAL(reloadSelected()), _clientProxy, SLOT(reloadQmlViewer()));
connect(m_toolbar, SIGNAL(animationSpeedChanged(qreal)), _clientProxy, SLOT(setAnimationSpeed(qreal))); connect(m_toolbar, SIGNAL(animationSpeedChanged(qreal)), _clientProxy, SLOT(setAnimationSpeed(qreal)));
connect(m_toolbar, SIGNAL(colorPickerSelected()), _clientProxy, SLOT(changeToColorPickerTool())); connect(m_toolbar, SIGNAL(colorPickerSelected()), _clientProxy, SLOT(changeToColorPickerTool()));
connect(m_toolbar, SIGNAL(zoomToolSelected()), _clientProxy, SLOT(changeToZoomTool())); connect(m_toolbar, SIGNAL(zoomToolSelected()), _clientProxy, SLOT(changeToZoomTool()));