From 1695f0622b4673c49ccb6b127f1a7d9b24611d80 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 26 Oct 2011 15:52:48 +0200 Subject: [PATCH] Debugger: Split inspector plugin into a qtquick1 and a qtquick2 plugin This allows the inspector to be used also when e.g. qtquick1 and widgets libraries are not available. Change-Id: Id8510ea2a1a9c2a776d67e6d7732a4e40363d5a3 Reviewed-by: Aurindam Jana --- .../debugger/qdeclarativeinspectorinterface_p.h | 6 +- .../debugger/qdeclarativeinspectorservice.cpp | 43 +++++++---- .../debugger/qdeclarativeinspectorservice_p.h | 9 +-- .../qmldbg_inspector/qmldbg_inspector.pro | 57 -------------- .../abstractliveedittool.cpp | 3 +- .../abstractliveedittool.h | 6 +- .../boundingrecthighlighter.cpp | 5 +- .../boundingrecthighlighter.h | 2 + .../colorpickertool.cpp | 2 + .../qtquick1 => qmldbg_qtquick1}/colorpickertool.h | 2 + .../qtquick1 => qmldbg_qtquick1}/livelayeritem.cpp | 4 +- .../qtquick1 => qmldbg_qtquick1}/livelayeritem.h | 4 +- .../liverubberbandselectionmanipulator.cpp | 2 + .../liverubberbandselectionmanipulator.h | 4 +- .../liveselectionindicator.cpp | 6 +- .../liveselectionindicator.h | 4 +- .../liveselectionrectangle.cpp | 6 +- .../liveselectionrectangle.h | 2 + .../liveselectiontool.cpp | 2 + .../liveselectiontool.h | 2 + .../livesingleselectionmanipulator.cpp | 2 + .../livesingleselectionmanipulator.h | 2 + .../qdeclarativeviewinspector.cpp | 2 + .../qdeclarativeviewinspector.h | 2 + .../qdeclarativeviewinspector_p.h | 2 + .../qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro | 50 ++++++++++++ .../qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp | 88 ++++++++++++++++++++++ .../qtquick1plugin.h} | 16 ++-- .../subcomponentmasklayeritem.cpp | 4 +- .../subcomponentmasklayeritem.h | 2 + .../qtquick1 => qmldbg_qtquick1}/zoomtool.cpp | 2 + .../qtquick1 => qmldbg_qtquick1}/zoomtool.h | 2 + .../qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro | 31 ++++++++ .../qtquick2plugin.cpp} | 39 +++++----- .../qmltooling/qmldbg_qtquick2/qtquick2plugin.h | 77 +++++++++++++++++++ .../sghighlight.cpp | 2 + .../sghighlight.h | 2 + .../sgselectiontool.cpp | 2 + .../sgselectiontool.h | 2 + .../sgviewinspector.cpp | 2 + .../sgviewinspector.h | 2 + src/plugins/qmltooling/qmltooling.pro | 5 +- .../{qmldbg_inspector => shared}/abstracttool.cpp | 0 .../{qmldbg_inspector => shared}/abstracttool.h | 0 .../abstractviewinspector.cpp | 5 +- .../abstractviewinspector.h | 3 +- .../qdeclarativeinspectorprotocol.h | 0 .../qmlinspectorconstants.h | 0 .../tst_qdeclarativeinspector.cpp | 2 +- 49 files changed, 394 insertions(+), 125 deletions(-) delete mode 100644 src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/abstractliveedittool.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/abstractliveedittool.h (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/boundingrecthighlighter.cpp (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/boundingrecthighlighter.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/colorpickertool.cpp (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/colorpickertool.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/livelayeritem.cpp (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/livelayeritem.h (96%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liverubberbandselectionmanipulator.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liverubberbandselectionmanipulator.h (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectionindicator.cpp (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectionindicator.h (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectionrectangle.cpp (97%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectionrectangle.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectiontool.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/liveselectiontool.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/livesingleselectionmanipulator.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/livesingleselectionmanipulator.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/qdeclarativeviewinspector.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/qdeclarativeviewinspector.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/qdeclarativeviewinspector_p.h (98%) create mode 100644 src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro create mode 100644 src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp rename src/plugins/qmltooling/{qmldbg_inspector/qdeclarativeinspectorplugin.h => qmldbg_qtquick1/qtquick1plugin.h} (85%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/subcomponentmasklayeritem.cpp (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/subcomponentmasklayeritem.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/zoomtool.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector/qtquick1 => qmldbg_qtquick1}/zoomtool.h (98%) create mode 100644 src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro rename src/plugins/qmltooling/{qmldbg_inspector/qdeclarativeinspectorplugin.cpp => qmldbg_qtquick2/qtquick2plugin.cpp} (68%) create mode 100644 src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sghighlight.cpp (98%) rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sghighlight.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sgselectiontool.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sgselectiontool.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sgviewinspector.cpp (99%) rename src/plugins/qmltooling/{qmldbg_inspector => qmldbg_qtquick2}/sgviewinspector.h (98%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/abstracttool.cpp (100%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/abstracttool.h (100%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/abstractviewinspector.cpp (98%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/abstractviewinspector.h (99%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/qdeclarativeinspectorprotocol.h (100%) rename src/plugins/qmltooling/{qmldbg_inspector => shared}/qmlinspectorconstants.h (100%) diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h index d4cd783..dd30427 100644 --- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h @@ -67,8 +67,12 @@ public: QDeclarativeInspectorInterface() {} virtual ~QDeclarativeInspectorInterface() {} - virtual void activate() = 0; + virtual bool canHandleView(QObject *view) = 0; + + virtual void activate(QObject *view) = 0; virtual void deactivate() = 0; + + virtual void clientMessage(const QByteArray &message) = 0; }; Q_DECLARE_INTERFACE(QDeclarativeInspectorInterface, "com.trolltech.Qt.QDeclarativeInspectorInterface/1.0") diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index 56441ae..d6fdaa5 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -54,7 +54,7 @@ Q_GLOBAL_STATIC(QDeclarativeInspectorService, serviceInstance) QDeclarativeInspectorService::QDeclarativeInspectorService() : QDeclarativeDebugService(QLatin1String("QDeclarativeObserverMode")) - , m_inspectorPlugin(0) + , m_currentInspectorPlugin(0) { } @@ -91,34 +91,46 @@ void QDeclarativeInspectorService::statusChanged(Status /*status*/) void QDeclarativeInspectorService::updateStatus() { if (m_views.isEmpty()) { - if (m_inspectorPlugin) - m_inspectorPlugin->deactivate(); + if (m_currentInspectorPlugin) { + m_currentInspectorPlugin->deactivate(); + m_currentInspectorPlugin = 0; + } return; } if (status() == Enabled) { - if (!m_inspectorPlugin) - m_inspectorPlugin = loadInspectorPlugin(); + if (m_inspectorPlugins.isEmpty()) + loadInspectorPlugins(); - if (!m_inspectorPlugin) { - qWarning() << "Error while loading inspector plugin"; + if (m_inspectorPlugins.isEmpty()) { + qWarning() << "QDeclarativeInspector: No plugins found."; QDeclarativeDebugServer::instance()->removeService(this); return; } - m_inspectorPlugin->activate(); + foreach (QDeclarativeInspectorInterface *inspector, m_inspectorPlugins) { + if (inspector->canHandleView(m_views.first())) { + m_currentInspectorPlugin = inspector; + break; + } + } + + m_currentInspectorPlugin->activate(m_views.first()); } else { - if (m_inspectorPlugin) - m_inspectorPlugin->deactivate(); + if (m_currentInspectorPlugin) { + m_currentInspectorPlugin->deactivate(); + m_currentInspectorPlugin = 0; + } } } void QDeclarativeInspectorService::messageReceived(const QByteArray &message) { - emit gotMessage(message); + if (m_currentInspectorPlugin) + m_currentInspectorPlugin->clientMessage(message); } -QDeclarativeInspectorInterface *QDeclarativeInspectorService::loadInspectorPlugin() +void QDeclarativeInspectorService::loadInspectorPlugins() { QStringList pluginCandidates; const QStringList paths = QCoreApplication::libraryPaths(); @@ -136,12 +148,11 @@ QDeclarativeInspectorInterface *QDeclarativeInspectorService::loadInspectorPlugi QDeclarativeInspectorInterface *inspector = qobject_cast(loader.instance()); - if (inspector) - return inspector; - loader.unload(); + m_inspectorPlugins << inspector; + else + loader.unload(); } - return 0; } QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h index df51ab8..9aa71ae 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h @@ -76,23 +76,20 @@ public: void addView(QObject *); void removeView(QObject *); - QList views() const { return m_views; } void sendMessage(const QByteArray &message); -Q_SIGNALS: - void gotMessage(const QByteArray &message); - protected: virtual void statusChanged(Status status); virtual void messageReceived(const QByteArray &); private: void updateStatus(); - static QDeclarativeInspectorInterface *loadInspectorPlugin(); + void loadInspectorPlugins(); QList m_views; - QDeclarativeInspectorInterface *m_inspectorPlugin; + QDeclarativeInspectorInterface *m_currentInspectorPlugin; + QList m_inspectorPlugins; }; QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro deleted file mode 100644 index 0c870bb..0000000 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ /dev/null @@ -1,57 +0,0 @@ -load(qt_module) - -TARGET = qmldbg_inspector -QT += declarative-private core-private gui-private opengl-private qtquick1 widgets widgets-private v8-private - -load(qt_plugin) - -DESTDIR = $$QT.declarative.plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" - -INCLUDEPATH *= $$PWD - -SOURCES += \ - abstractviewinspector.cpp \ - qdeclarativeinspectorplugin.cpp \ - qtquick1/qdeclarativeviewinspector.cpp \ - qtquick1/abstractliveedittool.cpp \ - qtquick1/liveselectiontool.cpp \ - qtquick1/livelayeritem.cpp \ - qtquick1/livesingleselectionmanipulator.cpp \ - qtquick1/liverubberbandselectionmanipulator.cpp \ - qtquick1/liveselectionrectangle.cpp \ - qtquick1/liveselectionindicator.cpp \ - qtquick1/boundingrecthighlighter.cpp \ - qtquick1/subcomponentmasklayeritem.cpp \ - qtquick1/zoomtool.cpp \ - qtquick1/colorpickertool.cpp \ - abstracttool.cpp \ - sgviewinspector.cpp \ - sgselectiontool.cpp \ - sghighlight.cpp - -HEADERS += \ - abstractviewinspector.h \ - qdeclarativeinspectorplugin.h \ - qdeclarativeinspectorprotocol.h \ - qmlinspectorconstants.h \ - qtquick1/qdeclarativeviewinspector.h \ - qtquick1/qdeclarativeviewinspector_p.h \ - qtquick1/abstractliveedittool.h \ - qtquick1/liveselectiontool.h \ - qtquick1/livelayeritem.h \ - qtquick1/livesingleselectionmanipulator.h \ - qtquick1/liverubberbandselectionmanipulator.h \ - qtquick1/liveselectionrectangle.h \ - qtquick1/liveselectionindicator.h \ - qtquick1/boundingrecthighlighter.h \ - qtquick1/subcomponentmasklayeritem.h \ - qtquick1/zoomtool.h \ - qtquick1/colorpickertool.h \ - abstracttool.h \ - sgviewinspector.h \ - sgselectiontool.h \ - sghighlight.h - -target.path += $$[QT_INSTALL_PLUGINS]/qmltooling -INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.cpp index c248292..09a39d6 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.cpp @@ -49,6 +49,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { AbstractLiveEditTool::AbstractLiveEditTool(QDeclarativeViewInspector *editorView) : AbstractTool(editorView) @@ -192,5 +193,5 @@ QString AbstractLiveEditTool::titleForItem(QGraphicsItem *item) return constructedName; } - +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.h similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h rename to src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.h index 04b5f4e..fd57076 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.h @@ -43,7 +43,7 @@ #define ABSTRACTLIVEEDITTOOL_H #include -#include "../abstracttool.h" +#include "abstracttool.h" QT_BEGIN_NAMESPACE class QMouseEvent; @@ -57,6 +57,7 @@ class QDeclarativeView; QT_END_NAMESPACE namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; @@ -99,6 +100,7 @@ private: QList m_itemList; }; -} +} // namespace QtQuick1 +} // namesacpe QmlJSDebugger #endif // ABSTRACTLIVEEDITTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.cpp similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.cpp index e097d3c..7cf1e83 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.cpp @@ -42,7 +42,7 @@ #include "boundingrecthighlighter.h" #include "qdeclarativeviewinspector.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include @@ -51,6 +51,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { BoundingBox::BoundingBox(QGraphicsObject *itemToHighlight, QGraphicsItem *parentItem, QObject *parent) @@ -236,5 +237,5 @@ void BoundingRectHighlighter::refresh() highlightAll(); } - +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h rename to src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.h index 81883ee..e99197f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.h @@ -54,6 +54,7 @@ QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem) QT_FORWARD_DECLARE_CLASS(QTimer) namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; class BoundingBox; @@ -110,6 +111,7 @@ public: int type() const; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // BOUNDINGRECTHIGHLIGHTER_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.cpp similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.cpp index 581c1f5..3372f9c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.cpp @@ -52,6 +52,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { ColorPickerTool::ColorPickerTool(QDeclarativeViewInspector *view) : AbstractLiveEditTool(view) @@ -95,4 +96,5 @@ void ColorPickerTool::pickColor(const QPoint &pos) emit selectedColorChanged(m_selectedColor); } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h rename to src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.h index a28ffea..7e86b01 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.h @@ -49,6 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QPoint) namespace QmlJSDebugger { +namespace QtQuick1 { class ColorPickerTool : public AbstractLiveEditTool { @@ -87,6 +88,7 @@ private: QColor m_selectedColor; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // COLORPICKERTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.cpp similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.cpp index fb7118f..7788eab 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.cpp @@ -41,11 +41,12 @@ #include "livelayeritem.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include namespace QmlJSDebugger { +namespace QtQuick1 { LiveLayerItem::LiveLayerItem(QGraphicsScene* scene) : QGraphicsObject() @@ -89,4 +90,5 @@ QList LiveLayerItem::findAllChildItems(const QGraphicsItem *item return itemList; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.h similarity index 96% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h rename to src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.h index 15f9a27..d819cae 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.h @@ -45,6 +45,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { class LiveLayerItem : public QGraphicsObject { @@ -62,6 +63,7 @@ protected: QList findAllChildItems(const QGraphicsItem *item) const; }; -} +} // namespace QtQuick1 +} // namespace QmlJSDebugger #endif // LIVELAYERITEM_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.cpp index 4987237..cfa0d4f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.cpp @@ -48,6 +48,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { LiveRubberBandSelectionManipulator::LiveRubberBandSelectionManipulator(QGraphicsObject *layerItem, QDeclarativeViewInspector *editorView) @@ -162,4 +163,5 @@ bool LiveRubberBandSelectionManipulator::isActive() const return m_isActive; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.h similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h rename to src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.h index aa15a34..092e852 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.h @@ -49,6 +49,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsItem) namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; @@ -91,6 +92,7 @@ private: bool m_isActive; }; -} +} // namespace QtQuick1 +} // namespace QmlJSDebugger #endif // RUBBERBANDSELECTIONMANIPULATOR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.cpp similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.cpp index 744cbf5..0c3f47e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.cpp @@ -42,7 +42,7 @@ #include "liveselectionindicator.h" #include "qdeclarativeviewinspector_p.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include #include @@ -50,6 +50,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { LiveSelectionIndicator::LiveSelectionIndicator(QDeclarativeViewInspector *viewInspector, QGraphicsObject *layerItem) @@ -114,5 +115,6 @@ void LiveSelectionIndicator::setItems(const QList } } -} //namespace QmlJSDebugger +} // namespace QtQuick1 +} // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.h similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.h index 7b8cc12..db57834 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.h @@ -53,6 +53,7 @@ class QPolygonF; QT_END_NAMESPACE namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; @@ -75,6 +76,7 @@ private: QDeclarativeViewInspector *m_view; }; -} +} // namespace QtQuick1 +} // namespace QmlJSDebugger #endif // LIVESELECTIONINDICATOR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.cpp similarity index 97% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.cpp index 2357756..a867aa6 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.cpp @@ -41,7 +41,7 @@ #include "liveselectionrectangle.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include #include @@ -53,6 +53,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { class SelectionRectShape : public QGraphicsRectItem { @@ -110,4 +111,5 @@ void LiveSelectionRectangle::setRect(const QPointF &firstPoint, m_controlShape->setRect(rect); } -} +} // namespace QtQuick1 +} // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.h index 730cca5..17eeda7 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.h @@ -50,6 +50,7 @@ QT_FORWARD_DECLARE_CLASS(QPointF) QT_FORWARD_DECLARE_CLASS(QRectF) namespace QmlJSDebugger { +namespace QtQuick1 { class LiveSelectionRectangle { @@ -72,6 +73,7 @@ private: QWeakPointer m_layerItem; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // LIVESELECTIONRECTANGLE_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.cpp index dc51a1f..5307409 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.cpp @@ -58,6 +58,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { LiveSelectionTool::LiveSelectionTool(QDeclarativeViewInspector *editorView) : AbstractLiveEditTool(editorView), @@ -420,4 +421,5 @@ void LiveSelectionTool::selectUnderPoint(QMouseEvent *event) m_singleSelectionManipulator.end(event->pos()); } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h rename to src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.h index 2c281cd..b6a9aac 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.h @@ -56,6 +56,7 @@ QT_FORWARD_DECLARE_CLASS(QKeyEvent) QT_FORWARD_DECLARE_CLASS(QAction) namespace QmlJSDebugger { +namespace QtQuick1 { class LiveSelectionTool : public AbstractLiveEditTool { @@ -115,6 +116,7 @@ private: QList m_contextMenuItemList; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // LIVESELECTIONTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.cpp index 9c78018..c07e3fa 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.cpp @@ -46,6 +46,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { LiveSingleSelectionManipulator::LiveSingleSelectionManipulator(QDeclarativeViewInspector *editorView) : m_editorView(editorView), @@ -148,4 +149,5 @@ QPointF LiveSingleSelectionManipulator::beginPoint() const return m_beginPoint; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h rename to src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.h index ac65711..80923a0 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.h @@ -48,6 +48,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsItem) namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; @@ -84,6 +85,7 @@ private: bool m_isActive; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // LIVESINGLESELECTIONMANIPULATOR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.cpp index ca34f9e..27d252a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.cpp @@ -52,6 +52,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { QDeclarativeViewInspectorPrivate::QDeclarativeViewInspectorPrivate(QDeclarativeViewInspector *q) : q(q) @@ -442,4 +443,5 @@ QRectF QDeclarativeViewInspector::adjustToScreenBoundaries(const QRectF &boundin return boundingRect; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h rename to src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.h index 5ac6b42..f430aa7 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.h @@ -50,6 +50,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { class AbstractLiveEditTool; class QDeclarativeViewInspectorPrivate; @@ -95,6 +96,7 @@ private: friend class AbstractLiveEditTool; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // QDECLARATIVEVIEWINSPECTOR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector_p.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h rename to src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector_p.h index a51f155..98dc03f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector_p.h @@ -52,6 +52,7 @@ #include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; class LiveSelectionTool; @@ -114,6 +115,7 @@ public: static QDeclarativeViewInspectorPrivate *get(QDeclarativeViewInspector *v) { return v->d_func(); } }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // QDECLARATIVEVIEWINSPECTOR_P_H diff --git a/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro b/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro new file mode 100644 index 0000000..1b0229d --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro @@ -0,0 +1,50 @@ +load(qt_module) + +TARGET = qmldbg_qtquick1 +QT += declarative-private core-private gui-private widget-private qtquick1 opengl-private + +load(qt_plugin) + +DESTDIR = $$QT.declarative.plugins/qmltooling + +INCLUDEPATH *= $$PWD $$PWD/../shared + +SOURCES += \ + abstractliveedittool.cpp \ + boundingrecthighlighter.cpp \ + colorpickertool.cpp \ + livelayeritem.cpp \ + liverubberbandselectionmanipulator.cpp \ + liveselectionindicator.cpp \ + liveselectionrectangle.cpp \ + liveselectiontool.cpp \ + livesingleselectionmanipulator.cpp \ + qdeclarativeviewinspector.cpp \ + qtquick1plugin.cpp \ + ../shared/abstracttool.cpp \ + ../shared/abstractviewinspector.cpp \ + subcomponentmasklayeritem.cpp \ + zoomtool.cpp + +HEADERS += \ + abstractliveedittool.h \ + boundingrecthighlighter.h \ + colorpickertool.h \ + livelayeritem.h \ + liverubberbandselectionmanipulator.h \ + liveselectionindicator.h \ + liveselectionrectangle.h \ + liveselectiontool.h \ + livesingleselectionmanipulator.h \ + qdeclarativeviewinspector.h \ + qdeclarativeviewinspector_p.h \ + qtquick1plugin.h \ + ../shared/abstracttool.h \ + ../shared/abstractviewinspector.h \ + ../shared/qdeclarativeinspectorprotocol.h \ + ../shared/qmlinspectorconstants.h \ + subcomponentmasklayeritem.h \ + zoomtool.h + +target.path += $$[QT_INSTALL_PLUGINS]/qmltooling +INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp new file mode 100644 index 0000000..a8ad407 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtquick1plugin.h" +#include "qdeclarativeviewinspector.h" + +#include +#include +#include + +namespace QmlJSDebugger { +namespace QtQuick1 { + +QtQuick1Plugin::QtQuick1Plugin() : + m_inspector(0) +{ +} + +QtQuick1Plugin::~QtQuick1Plugin() +{ + delete m_inspector; +} + +bool QtQuick1Plugin::canHandleView(QObject *view) +{ + return qobject_cast(view); +} + +void QtQuick1Plugin::activate(QObject *view) +{ + QDeclarativeView *qDeclarativeView = qobject_cast(view); + Q_ASSERT(qDeclarativeView); + m_inspector = new QDeclarativeViewInspector(qDeclarativeView, qDeclarativeView); +} + +void QtQuick1Plugin::deactivate() +{ + delete m_inspector; +} + +void QtQuick1Plugin::clientMessage(const QByteArray &message) +{ + if (m_inspector) + m_inspector->handleMessage(message); +} + +} // namespace QtQuick1 +} // namespace QmlJSDebugger + +Q_EXPORT_PLUGIN2(qmldbg_qtquick1, QmlJSDebugger::QtQuick1::QtQuick1Plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.h similarity index 85% rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h rename to src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.h index 5429253..3804874 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.h @@ -49,23 +49,29 @@ namespace QmlJSDebugger { class AbstractViewInspector; -class QDeclarativeInspectorPlugin : public QObject, public QDeclarativeInspectorInterface +namespace QtQuick1 { + +class QtQuick1Plugin : public QObject, public QDeclarativeInspectorInterface { Q_OBJECT - Q_DISABLE_COPY(QDeclarativeInspectorPlugin) + Q_DISABLE_COPY(QtQuick1Plugin) Q_INTERFACES(QDeclarativeInspectorInterface) public: - QDeclarativeInspectorPlugin(); - ~QDeclarativeInspectorPlugin(); + QtQuick1Plugin(); + ~QtQuick1Plugin(); - void activate(); + // QDeclarativeInspectorInterface + bool canHandleView(QObject *view); + void activate(QObject *view); void deactivate(); + void clientMessage(const QByteArray &message); private: QPointer m_inspector; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // QDECLARATIVEINSPECTORPLUGIN_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.cpp similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.cpp index 4e3aed2..0b1b9f8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.cpp @@ -41,12 +41,13 @@ #include "subcomponentmasklayeritem.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include "qdeclarativeviewinspector.h" #include namespace QmlJSDebugger { +namespace QtQuick1 { SubcomponentMaskLayerItem::SubcomponentMaskLayerItem(QDeclarativeViewInspector *inspector, QGraphicsItem *parentItem) : @@ -127,4 +128,5 @@ QGraphicsItem *SubcomponentMaskLayerItem::currentItem() const return m_currentItem; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h rename to src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.h index 72c7466..c5f99f0 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.h @@ -45,6 +45,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; @@ -66,6 +67,7 @@ private: QRectF m_itemPolyRect; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // SUBCOMPONENTMASKLAYERITEM_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp rename to src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.cpp index 92f34b3..daf44e2 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.cpp @@ -53,6 +53,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick1 { ZoomTool::ZoomTool(QDeclarativeViewInspector *view) : AbstractLiveEditTool(view), @@ -325,4 +326,5 @@ qreal ZoomTool::nextZoomScale(ZoomDirection direction) const return 1.0f; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h rename to src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.h index de93559..bc26aae 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.h @@ -48,6 +48,7 @@ QT_FORWARD_DECLARE_CLASS(QAction) namespace QmlJSDebugger { +namespace QtQuick1 { class ZoomTool : public AbstractLiveEditTool { @@ -102,6 +103,7 @@ private: qreal m_currentScale; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // ZOOMTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro new file mode 100644 index 0000000..a06c1bd --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro @@ -0,0 +1,31 @@ +load(qt_module) + +TARGET = qmldbg_qtquick2 +QT += declarative-private core-private gui-private opengl-private v8-private + +load(qt_plugin) + +DESTDIR = $$QT.declarative.plugins/qmltooling + +INCLUDEPATH *= $$PWD $$PWD/../shared + +SOURCES += \ + qtquick2plugin.cpp \ + sghighlight.cpp \ + sgselectiontool.cpp \ + sgviewinspector.cpp \ + ../shared/abstracttool.cpp \ + ../shared/abstractviewinspector.cpp + +HEADERS += \ + qtquick2plugin.h \ + sghighlight.h \ + sgselectiontool.h \ + sgviewinspector.h \ + ../shared/abstracttool.h \ + ../shared/abstractviewinspector.h \ + ../shared/qdeclarativeinspectorprotocol.h \ + ../shared/qmlinspectorconstants.h + +target.path += $$[QT_INSTALL_PLUGINS]/qmltooling +INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp similarity index 68% rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp rename to src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp index f4eec50..5ed919c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp @@ -39,9 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeinspectorplugin.h" - -#include "qtquick1/qdeclarativeviewinspector_p.h" +#include "qtquick2plugin.h" #include "sgviewinspector.h" #include @@ -49,37 +47,42 @@ #include namespace QmlJSDebugger { +namespace QtQuick2 { -QDeclarativeInspectorPlugin::QDeclarativeInspectorPlugin() : +QtQuick2Plugin::QtQuick2Plugin() : m_inspector(0) { } -QDeclarativeInspectorPlugin::~QDeclarativeInspectorPlugin() +QtQuick2Plugin::~QtQuick2Plugin() { delete m_inspector; } -void QDeclarativeInspectorPlugin::activate() +bool QtQuick2Plugin::canHandleView(QObject *view) { - QDeclarativeInspectorService *service = QDeclarativeInspectorService::instance(); - QList views = service->views(); - if (views.isEmpty()) - return; + return qobject_cast(view); +} - // TODO: Support multiple views - QObject *firstView = views.first(); - if (QDeclarativeView *declarativeView = qobject_cast(firstView)) - m_inspector = new QDeclarativeViewInspector(declarativeView, declarativeView); - else if (QQuickView *sgView = qobject_cast(firstView)) - m_inspector = new SGViewInspector(sgView, sgView); +void QtQuick2Plugin::activate(QObject *view) +{ + QQuickView *qtQuickView = qobject_cast(view); + Q_ASSERT(qtQuickView); + m_inspector = new SGViewInspector(qtQuickView, qtQuickView); } -void QDeclarativeInspectorPlugin::deactivate() +void QtQuick2Plugin::deactivate() { delete m_inspector; } +void QtQuick2Plugin::clientMessage(const QByteArray &message) +{ + if (m_inspector) + m_inspector->handleMessage(message); +} + +} // namespace QtQuick2 } // namespace QmlJSDebugger -Q_EXPORT_PLUGIN2(declarativeinspector, QmlJSDebugger::QDeclarativeInspectorPlugin) +Q_EXPORT_PLUGIN2(qmldbg_qtquick2, QmlJSDebugger::QtQuick2::QtQuick2Plugin) diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h new file mode 100644 index 0000000..89edcad --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEINSPECTORPLUGIN_H +#define QDECLARATIVEINSPECTORPLUGIN_H + +#include +#include + +namespace QmlJSDebugger { + +class AbstractViewInspector; + +namespace QtQuick2 { + +class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface +{ + Q_OBJECT + Q_DISABLE_COPY(QtQuick2Plugin) + Q_INTERFACES(QDeclarativeInspectorInterface) + +public: + QtQuick2Plugin(); + ~QtQuick2Plugin(); + + // QDeclarativeInspectorInterface + bool canHandleView(QObject *view); + void activate(QObject *view); + void deactivate(); + void clientMessage(const QByteArray &message); + +private: + QPointer m_inspector; +}; + +} // namespace QtQuick2 +} // namespace QmlJSDebugger + +#endif // QDECLARATIVEINSPECTORPLUGIN_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp rename to src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp index 1af789d..ab254a3 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp @@ -44,6 +44,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick2 { SGHighlight::SGHighlight(QQuickItem *item, QQuickItem *parent) : QQuickPaintedItem(parent) @@ -95,4 +96,5 @@ void SGHoverHighlight::paint(QPainter *painter) painter->drawRect(QRect(0, 0, width() - 1, height() - 1)); } +} // namespace QtQuick2 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/sghighlight.h rename to src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h index 8d5659c..8ba1af6 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h @@ -46,6 +46,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick2 { class SGHighlight : public QQuickPaintedItem { @@ -92,6 +93,7 @@ public: void paint(QPainter *painter); }; +} // namespace QtQuick2 } // namespace QmlJSDebugger #endif // SGHIGHLIGHT_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp rename to src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp index bdfc28f..025aa2d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp @@ -50,6 +50,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick2 { SGSelectionTool::SGSelectionTool(SGViewInspector *inspector) : AbstractTool(inspector), @@ -132,4 +133,5 @@ SGViewInspector *SGSelectionTool::inspector() const return static_cast(AbstractTool::inspector()); } +} // namespace QtQuick2 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h rename to src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h index 5877017..fe338bd 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h @@ -51,6 +51,7 @@ QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QQuickItem) namespace QmlJSDebugger { +namespace QtQuick2 { class SGViewInspector; class SGHoverHighlight; @@ -86,6 +87,7 @@ private: SGHoverHighlight *m_hoverHighlight; }; +} // namespace QtQuick2 } // namespace QmlJSDebugger #endif // SGSELECTIONTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp rename to src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp index 7b573ca..06eb6ea 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp @@ -53,6 +53,7 @@ #include namespace QmlJSDebugger { +namespace QtQuick2 { /* * Collects all the items at the given position, from top to bottom. @@ -327,4 +328,5 @@ QString SGViewInspector::titleForItem(QQuickItem *item) const return constructedName; } +} // namespace QtQuick2 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h rename to src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h index 788d6a0..fa404a5 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h @@ -53,6 +53,7 @@ class QQuickItem; QT_END_NAMESPACE namespace QmlJSDebugger { +namespace QtQuick2 { class SGSelectionTool; class SGSelectionHighlight; @@ -105,6 +106,7 @@ private: bool m_designMode; }; +} // namespace QtQuick2 } // namespace QmlJSDebugger #endif // QSGVIEWINSPECTOR_H diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 5b735cb..d03ee07 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = qmldbg_tcp -SUBDIRS += qmldbg_inspector +SUBDIRS = qmldbg_tcp +SUBDIRS += qmldbg_qtquick2 +SUBDIRS += qmldbg_qtquick1 diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp b/src/plugins/qmltooling/shared/abstracttool.cpp similarity index 100% rename from src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp rename to src/plugins/qmltooling/shared/abstracttool.cpp diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_inspector/abstracttool.h rename to src/plugins/qmltooling/shared/abstracttool.h diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp similarity index 98% rename from src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp rename to src/plugins/qmltooling/shared/abstractviewinspector.cpp index 1cebbd4..796c4dc 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp @@ -61,11 +61,8 @@ AbstractViewInspector::AbstractViewInspector(QObject *parent) : m_designModeBehavior(false), m_animationPaused(false), m_slowDownFactor(1.0), - m_debugService(0) + m_debugService(QDeclarativeInspectorService::instance()) { - m_debugService = QDeclarativeInspectorService::instance(); - connect(m_debugService, SIGNAL(gotMessage(QByteArray)), - this, SLOT(handleMessage(QByteArray))); } void AbstractViewInspector::createQmlObject(const QString &qml, QObject *parent, diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h similarity index 99% rename from src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h rename to src/plugins/qmltooling/shared/abstractviewinspector.h index ee6eea5..a51efb0 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h +++ b/src/plugins/qmltooling/shared/abstractviewinspector.h @@ -72,6 +72,8 @@ class AbstractViewInspector : public QObject public: explicit AbstractViewInspector(QObject *parent = 0); + void handleMessage(const QByteArray &message); + void createQmlObject(const QString &qml, QObject *parent, const QStringList &importList, const QString &filename = QString()); @@ -128,7 +130,6 @@ protected: virtual bool wheelEvent(QWheelEvent *event); private slots: - void handleMessage(const QByteArray &message); void sendColorChanged(const QColor &color); private: diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h b/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h rename to src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h rename to src/plugins/qmltooling/shared/qmlinspectorconstants.h diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/tst_qdeclarativeinspector.cpp b/tests/auto/declarative/debugger/qdeclarativeinspector/tst_qdeclarativeinspector.cpp index 262f236..5545f8e 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/tst_qdeclarativeinspector.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/tst_qdeclarativeinspector.cpp @@ -45,7 +45,7 @@ #include #include -#include "../../../../../src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h" +#include "../../../../../src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h" #include "../shared/debugutil_p.h" using namespace QmlJSDebugger; -- 2.7.4