From 7e67880ef77005612d693ea50d407279344d5270 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Thu, 8 Jul 2010 12:30:08 +0200
Subject: [PATCH] connected reloading signals
---
src/plugins/qmljsinspector/qmlinspectortoolbar.cpp | 2 ++
src/plugins/qmljsinspector/qmlinspectortoolbar.h | 1 +
src/plugins/qmljsinspector/qmljsinspector.cpp | 7 ++++---
src/plugins/qmljsinspector/qmljsinspectorplugin.cpp | 1 +
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
index 94f32c6a243..cd1b3c360f6 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
@@ -167,6 +167,8 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
uiSwitcher->setToolbar(QmlJSInspector::Constants::LANG_QML, configBar);
setEnabled(false);
+ connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
+
connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
connect(m_playAction, SIGNAL(triggered()), SLOT(activatePlayOnClick()));
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index 09427b5e039..da19946ccee 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -43,6 +43,7 @@ public slots:
signals:
void animationSpeedChanged(qreal slowdownFactor = 1.0f);
+ void reloadSelected();
void colorPickerSelected();
void selectToolSelected();
void marqueeSelectToolSelected();
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index 90367afb376..643cead6276 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -85,9 +85,6 @@
#include <QtCore/QtPlugin>
#include <QtCore/QDateTime>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolBar>
-#include <QtGui/QBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QDockWidget>
#include <QtGui/QAction>
@@ -128,6 +125,10 @@ Inspector::Inspector(QObject *parent)
m_textPreview = new QmlJSLiveTextPreview(this);
+ connect(m_textPreview,
+ SIGNAL(selectedItemsChanged(QList<QDeclarativeDebugObjectReference>)),
+ SLOT(changeSelectedItems(QList<QDeclarativeDebugObjectReference>)));
+
connect(m_clientProxy, SIGNAL(selectedItemsChanged(QList<QDeclarativeDebugObjectReference>)),
SLOT(setSelectedItemsByObjectReference(QList<QDeclarativeDebugObjectReference>)));
diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
index 3513f7df512..36f82eeb6a0 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
@@ -165,6 +165,7 @@ void InspectorPlugin::extensionsInitialized()
connect(_clientProxy, SIGNAL(connected(QDeclarativeEngineDebug*)), m_toolbar, SLOT(enable()));
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(colorPickerSelected()), _clientProxy, SLOT(changeToColorPickerTool()));
connect(m_toolbar, SIGNAL(zoomToolSelected()), _clientProxy, SLOT(changeToZoomTool()));
--
GitLab