diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector')
35 files changed, 189 insertions, 805 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index c5e127c1..72f55ebf 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -44,17 +44,16 @@ #include "abstracttool.h" #include "qdeclarativeinspectorprotocol.h" -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/private/qdeclarativedebughelper_p.h> -#include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" +#include <QtQuick1/QDeclarativeEngine> +#include <QtQuick1/QDeclarativeComponent> +#include <QtCore/private/qabstractanimation_p.h> +#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> -#include <QtGui/QVBoxLayout> #include <QtGui/QMouseEvent> -#include <QtGui/QWidget> namespace QmlJSDebugger { + AbstractViewInspector::AbstractViewInspector(QObject *parent) : QObject(parent), m_currentTool(0), @@ -62,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, @@ -134,7 +130,8 @@ void AbstractViewInspector::animationSpeedChangeRequested(qreal factor) } const float effectiveFactor = m_animationPaused ? 0 : factor; - QDeclarativeDebugHelper::setAnimationSlowDownFactor(effectiveFactor); + QUnifiedTimer::instance()->setSlowModeEnabled(effectiveFactor != 1.0); + QUnifiedTimer::instance()->setSlowdownFactor(effectiveFactor); } void AbstractViewInspector::animationPausedChangeRequested(bool paused) @@ -145,22 +142,19 @@ void AbstractViewInspector::animationPausedChangeRequested(bool paused) } const float effectiveFactor = paused ? 0 : m_slowDownFactor; - QDeclarativeDebugHelper::setAnimationSlowDownFactor(effectiveFactor); + QUnifiedTimer::instance()->setSlowModeEnabled(effectiveFactor != 1.0); + QUnifiedTimer::instance()->setSlowdownFactor(effectiveFactor); } void AbstractViewInspector::setShowAppOnTop(bool appOnTop) { - if (viewWidget()) { - QWidget *window = viewWidget()->window(); - Qt::WindowFlags flags = window->windowFlags(); - if (appOnTop) - flags |= Qt::WindowStaysOnTopHint; - else - flags &= ~Qt::WindowStaysOnTopHint; + Qt::WindowFlags flags = windowFlags(); + if (appOnTop) + flags |= Qt::WindowStaysOnTopHint; + else + flags &= ~Qt::WindowStaysOnTopHint; - window->setWindowFlags(flags); - window->show(); - } + setWindowFlags(flags); m_showAppOnTop = appOnTop; sendShowAppOnTop(appOnTop); @@ -508,4 +502,3 @@ QString AbstractViewInspector::idStringForObject(QObject *obj) const } } // namespace QmlJSDebugger - diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h index 700476f9..7fbe4446 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h @@ -63,7 +63,7 @@ namespace QmlJSDebugger { class AbstractTool; /* - * The common code between QSGView and QDeclarativeView inspectors lives here, + * The common code between QQuickView and QDeclarativeView inspectors lives here, */ class AbstractViewInspector : public QObject { @@ -72,24 +72,13 @@ class AbstractViewInspector : public QObject public: explicit AbstractViewInspector(QObject *parent = 0); - virtual void changeCurrentObjects(const QList<QObject*> &objects) = 0; - - virtual void reloadView() = 0; + void handleMessage(const QByteArray &message); void createQmlObject(const QString &qml, QObject *parent, const QStringList &importList, const QString &filename = QString()); - - virtual void reparentQmlObject(QObject *object, QObject *newParent) = 0; - - virtual void changeTool(InspectorProtocol::Tool tool) = 0; - void clearComponentCache(); - virtual QWidget *viewWidget() const = 0; - virtual QDeclarativeEngine *declarativeEngine() const = 0; - - bool showAppOnTop() const { return m_showAppOnTop; } bool designModeBehavior() const { return m_designModeBehavior; } @@ -105,21 +94,13 @@ public: QString idStringForObject(QObject *obj) const; -public slots: - void sendDesignModeBehavior(bool inDesignMode); - void sendColorChanged(const QColor &color); - - void changeToColorPickerTool(); - void changeToZoomTool(); - void changeToSingleSelectTool(); - void changeToMarqueeSelectTool(); - - virtual void setDesignModeBehavior(bool value); - - void setShowAppOnTop(bool appOnTop); - - void setAnimationSpeed(qreal factor); - void setAnimationPaused(bool paused); + virtual void changeCurrentObjects(const QList<QObject*> &objects) = 0; + virtual void reloadView() = 0; + virtual void reparentQmlObject(QObject *object, QObject *newParent) = 0; + virtual void changeTool(InspectorProtocol::Tool tool) = 0; + virtual Qt::WindowFlags windowFlags() const = 0; + virtual void setWindowFlags(Qt::WindowFlags flags) = 0; + virtual QDeclarativeEngine *declarativeEngine() const = 0; signals: void designModeBehaviorChanged(bool inDesignMode); @@ -135,6 +116,8 @@ signals: void animationPausedChanged(bool paused); protected: + AbstractTool *currentTool() const { return m_currentTool; } + void setCurrentTool(AbstractTool *tool) { m_currentTool = tool; } bool eventFilter(QObject *, QEvent *); virtual bool leaveEvent(QEvent *); @@ -146,13 +129,24 @@ protected: virtual bool mouseDoubleClickEvent(QMouseEvent *event); virtual bool wheelEvent(QWheelEvent *event); - AbstractTool *currentTool() const { return m_currentTool; } - void setCurrentTool(AbstractTool *tool) { m_currentTool = tool; } - private slots: - void handleMessage(const QByteArray &message); + void sendColorChanged(const QColor &color); private: + void sendDesignModeBehavior(bool inDesignMode); + + void changeToColorPickerTool(); + void changeToZoomTool(); + void changeToSingleSelectTool(); + void changeToMarqueeSelectTool(); + + virtual void setDesignModeBehavior(bool value); + + void setShowAppOnTop(bool appOnTop); + + void setAnimationSpeed(qreal factor); + void setAnimationPaused(bool paused); + void animationSpeedChangeRequested(qreal factor); void animationPausedChangeRequested(bool paused); diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp index 9c2f70c4..8d6d3b33 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "abstractliveedittool.h" -#include "../qdeclarativeviewinspector_p.h" +#include "qdeclarativeviewinspector_p.h" #include <QDeclarativeEngine> @@ -49,6 +49,7 @@ #include <QDeclarativeItem> 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/editor/abstractliveedittool.h b/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h index f2996a10..83a3073b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h @@ -43,7 +43,7 @@ #define ABSTRACTLIVEEDITTOOL_H #include <QtCore/QList> -#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<QGraphicsItem*> m_itemList; }; -} +} // namespace QtQuick1 +} // namesacpe QmlJSDebugger #endif // ABSTRACTLIVEEDITTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp index f6305698..cace52a3 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp @@ -41,16 +41,17 @@ #include "boundingrecthighlighter.h" -#include "../qdeclarativeviewinspector.h" -#include "../qmlinspectorconstants.h" +#include "qdeclarativeviewinspector.h" +#include "qmlinspectorconstants.h" -#include <QtGui/QGraphicsPolygonItem> +#include <QtWidgets/QGraphicsPolygonItem> #include <QtCore/QTimer> #include <QtCore/QObject> #include <QtCore/QDebug> 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/editor/boundingrecthighlighter.h b/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.h index aef4e4ee..45f1b44a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp index 9fe40fbf..b9e77f6e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp @@ -41,17 +41,18 @@ #include "colorpickertool.h" -#include "../qdeclarativeviewinspector.h" +#include "qdeclarativeviewinspector.h" #include <QtGui/QMouseEvent> #include <QtGui/QKeyEvent> #include <QtCore/QRectF> #include <QtGui/QRgb> #include <QtGui/QImage> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QPalette> namespace QmlJSDebugger { +namespace QtQuick1 { ColorPickerTool::ColorPickerTool(QDeclarativeViewInspector *view) : AbstractLiveEditTool(view) @@ -75,9 +76,7 @@ void ColorPickerTool::mouseMoveEvent(QMouseEvent *event) void ColorPickerTool::clear() { -#ifndef QT_NO_CURSOR view()->setCursor(Qt::CrossCursor); -#endif } void ColorPickerTool::pickColor(const QPoint &pos) @@ -97,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/editor/colorpickertool.h b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.h index dda147bc..b61b2bb4 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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/editor/livelayeritem.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp index fd52b0eb..a177185d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp @@ -41,11 +41,12 @@ #include "livelayeritem.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include <QGraphicsScene> namespace QmlJSDebugger { +namespace QtQuick1 { LiveLayerItem::LiveLayerItem(QGraphicsScene* scene) : QGraphicsObject() @@ -89,4 +90,5 @@ QList<QGraphicsItem*> LiveLayerItem::findAllChildItems(const QGraphicsItem *item return itemList; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h index bfff002e..61c0c2dc 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h @@ -42,9 +42,10 @@ #ifndef LIVELAYERITEM_H #define LIVELAYERITEM_H -#include <QtGui/QGraphicsObject> +#include <QtWidgets/QGraphicsObject> namespace QmlJSDebugger { +namespace QtQuick1 { class LiveLayerItem : public QGraphicsObject { @@ -62,6 +63,7 @@ protected: QList<QGraphicsItem*> findAllChildItems(const QGraphicsItem *item) const; }; -} +} // namespace QtQuick1 +} // namespace QmlJSDebugger #endif // LIVELAYERITEM_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp index 7c04f62c..7c259d53 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp @@ -41,13 +41,14 @@ #include "liverubberbandselectionmanipulator.h" -#include "../qdeclarativeviewinspector_p.h" +#include "qdeclarativeviewinspector_p.h" -#include <QtGui/QGraphicsItem> +#include <QtWidgets/QGraphicsItem> #include <QtCore/QDebug> 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/editor/liverubberbandselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.h index c1609ea3..8db8a87e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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/editor/liveselectionindicator.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp index 9545651d..5715d6e8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp @@ -41,15 +41,16 @@ #include "liveselectionindicator.h" -#include "../qdeclarativeviewinspector_p.h" -#include "../qmlinspectorconstants.h" +#include "qdeclarativeviewinspector_p.h" +#include "qmlinspectorconstants.h" -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsObject> -#include <QtGui/QGraphicsScene> +#include <QtWidgets/QGraphicsRectItem> +#include <QtWidgets/QGraphicsObject> +#include <QtWidgets/QGraphicsScene> #include <QtGui/QPen> namespace QmlJSDebugger { +namespace QtQuick1 { LiveSelectionIndicator::LiveSelectionIndicator(QDeclarativeViewInspector *viewInspector, QGraphicsObject *layerItem) @@ -114,5 +115,6 @@ void LiveSelectionIndicator::setItems(const QList<QWeakPointer<QGraphicsObject> } } -} //namespace QmlJSDebugger +} // namespace QtQuick1 +} // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h index db386288..7effc3a9 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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/editor/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp index 91db2866..e03cc594 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp @@ -41,18 +41,19 @@ #include "liveselectionrectangle.h" -#include "../qmlinspectorconstants.h" +#include "qmlinspectorconstants.h" #include <QtGui/QPen> -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsObject> -#include <QtGui/QGraphicsScene> +#include <QtWidgets/QGraphicsRectItem> +#include <QtWidgets/QGraphicsObject> +#include <QtWidgets/QGraphicsScene> #include <QtCore/QtDebug> #include <cmath> 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/editor/liveselectionrectangle.h b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.h index 5fe42a00..cb1487e6 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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<QGraphicsObject> m_layerItem; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // LIVESELECTIONRECTANGLE_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index 288f1ec5..55489243 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -42,22 +42,23 @@ #include "liveselectiontool.h" #include "livelayeritem.h" -#include "../qdeclarativeviewinspector_p.h" +#include "qdeclarativeviewinspector_p.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QWheelEvent> #include <QtGui/QMouseEvent> #include <QtGui/QClipboard> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QGraphicsObject> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QGraphicsObject> -#include <QtDeclarative/QDeclarativeItem> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQuick1/QDeclarativeItem> +#include <QtQuick1/QDeclarativeEngine> #include <QtCore/QDebug> namespace QmlJSDebugger { +namespace QtQuick1 { LiveSelectionTool::LiveSelectionTool(QDeclarativeViewInspector *editorView) : AbstractLiveEditTool(editorView), @@ -363,9 +364,7 @@ void LiveSelectionTool::setSelectOnlyContentItems(bool selectOnlyContentItems) void LiveSelectionTool::clear() { -#ifndef QT_NO_CURSOR view()->setCursor(Qt::ArrowCursor); -#endif m_rubberbandSelectionManipulator.clear(), m_singleSelectionManipulator.clear(); m_selectionIndicator.clear(); @@ -422,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/editor/liveselectiontool.h b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.h index eb3c63df..f271aa8e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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<QGraphicsItem*> m_contextMenuItemList; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // LIVESELECTIONTOOL_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp index 67583943..dbdcde28 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp @@ -41,11 +41,12 @@ #include "livesingleselectionmanipulator.h" -#include "../qdeclarativeviewinspector_p.h" +#include "qdeclarativeviewinspector_p.h" #include <QtDebug> 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/editor/livesingleselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.h index 256a6ead..e0b4a69c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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/editor/qmltoolbar.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp deleted file mode 100644 index ead0e166..00000000 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp +++ /dev/null @@ -1,328 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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 "qmltoolbar.h" -#include "toolbarcolorbox.h" - -#include <QtGui/QLabel> -#include <QtGui/QIcon> -#include <QtGui/QAction> -#include <QtGui/QMenu> - -#include <QtCore/QDebug> - -namespace QmlJSDebugger { - -QmlToolBar::QmlToolBar(QWidget *parent) - : QToolBar(parent) - , m_emitSignals(true) - , m_paused(false) - , m_animationSpeed(1.0f) - , ui(new Ui) -{ - ui->playIcon = QIcon(QLatin1String(":/qml/images/play-24.png")); - ui->pauseIcon = QIcon(QLatin1String(":/qml/images/pause-24.png")); - - ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/inspectormode-24.png")), - tr("Inspector Mode"), this); - ui->play = new QAction(ui->pauseIcon, tr("Play/Pause Animations"), this); - ui->select = new QAction(QIcon(QLatin1String(":/qml/images/select-24.png")), tr("Select"), this); - ui->selectMarquee = new QAction(QIcon(QLatin1String(":/qml/images/select-marquee-24.png")), - tr("Select (Marquee)"), this); - ui->zoom = new QAction(QIcon(QLatin1String(":/qml/images/zoom-24.png")), tr("Zoom"), this); - ui->colorPicker = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-24.png")), - tr("Color Picker"), this); - ui->toQml = new QAction(QIcon(QLatin1String(":/qml/images/to-qml-24.png")), - tr("Apply Changes to QML Viewer"), this); - ui->fromQml = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-24.png")), - tr("Apply Changes to Document"), this); - ui->designmode->setCheckable(true); - ui->designmode->setChecked(false); - - ui->play->setCheckable(false); - ui->select->setCheckable(true); - ui->selectMarquee->setCheckable(true); - ui->zoom->setCheckable(true); - ui->colorPicker->setCheckable(true); - - setWindowTitle(tr("Tools")); - - addAction(ui->designmode); - addAction(ui->play); - addSeparator(); - - addAction(ui->select); - // disabled because multi selection does not do anything useful without design mode - //addAction(ui->selectMarquee); - addSeparator(); - addAction(ui->zoom); - addAction(ui->colorPicker); - //addAction(ui->fromQml); - - ui->colorBox = new ToolBarColorBox(this); - ui->colorBox->setMinimumSize(24, 24); - ui->colorBox->setMaximumSize(28, 28); - ui->colorBox->setColor(Qt::black); - addWidget(ui->colorBox); - - setWindowFlags(Qt::Tool); - - QMenu *playSpeedMenu = new QMenu(this); - ui->playSpeedMenuActions = new QActionGroup(this); - ui->playSpeedMenuActions->setExclusive(true); - - QAction *speedAction = playSpeedMenu->addAction(tr("1x"), this, SLOT(changeAnimationSpeed())); - speedAction->setCheckable(true); - speedAction->setChecked(true); - speedAction->setData(1.0f); - ui->playSpeedMenuActions->addAction(speedAction); - - speedAction = playSpeedMenu->addAction(tr("0.5x"), this, SLOT(changeAnimationSpeed())); - speedAction->setCheckable(true); - speedAction->setData(2.0f); - ui->playSpeedMenuActions->addAction(speedAction); - - speedAction = playSpeedMenu->addAction(tr("0.25x"), this, SLOT(changeAnimationSpeed())); - speedAction->setCheckable(true); - speedAction->setData(4.0f); - ui->playSpeedMenuActions->addAction(speedAction); - - speedAction = playSpeedMenu->addAction(tr("0.125x"), this, SLOT(changeAnimationSpeed())); - speedAction->setCheckable(true); - speedAction->setData(8.0f); - ui->playSpeedMenuActions->addAction(speedAction); - - speedAction = playSpeedMenu->addAction(tr("0.1x"), this, SLOT(changeAnimationSpeed())); - speedAction->setCheckable(true); - speedAction->setData(10.0f); - ui->playSpeedMenuActions->addAction(speedAction); - - ui->play->setMenu(playSpeedMenu); - - connect(ui->designmode, SIGNAL(toggled(bool)), SLOT(setDesignModeBehaviorOnClick(bool))); - - connect(ui->colorPicker, SIGNAL(triggered()), SLOT(activateColorPickerOnClick())); - - connect(ui->play, SIGNAL(triggered()), SLOT(activatePlayOnClick())); - - connect(ui->zoom, SIGNAL(triggered()), SLOT(activateZoomOnClick())); - connect(ui->colorPicker, SIGNAL(triggered()), SLOT(activateColorPickerOnClick())); - connect(ui->select, SIGNAL(triggered()), SLOT(activateSelectToolOnClick())); - connect(ui->selectMarquee, SIGNAL(triggered()), SLOT(activateMarqueeSelectToolOnClick())); - - connect(ui->toQml, SIGNAL(triggered()), SLOT(activateToQml())); - connect(ui->fromQml, SIGNAL(triggered()), SLOT(activateFromQml())); -} - -QmlToolBar::~QmlToolBar() -{ - delete ui; -} - -void QmlToolBar::activateColorPicker() -{ - m_emitSignals = false; - activateColorPickerOnClick(); - m_emitSignals = true; -} - -void QmlToolBar::activateSelectTool() -{ - m_emitSignals = false; - activateSelectToolOnClick(); - m_emitSignals = true; -} - -void QmlToolBar::activateMarqueeSelectTool() -{ - m_emitSignals = false; - activateMarqueeSelectToolOnClick(); - m_emitSignals = true; -} - -void QmlToolBar::activateZoom() -{ - m_emitSignals = false; - activateZoomOnClick(); - m_emitSignals = true; -} - -void QmlToolBar::setAnimationSpeed(qreal slowDownFactor) -{ - if (m_animationSpeed == slowDownFactor) - return; - - m_emitSignals = false; - m_animationSpeed = slowDownFactor; - - foreach (QAction *action, ui->playSpeedMenuActions->actions()) { - if (action->data().toReal() == slowDownFactor) { - action->setChecked(true); - break; - } - } - - m_emitSignals = true; -} - -void QmlToolBar::setAnimationPaused(bool paused) -{ - if (m_paused == paused) - return; - - m_paused = paused; - updatePlayAction(); -} - -void QmlToolBar::changeAnimationSpeed() -{ - QAction *action = qobject_cast<QAction*>(sender()); - m_animationSpeed = action->data().toReal(); - emit animationSpeedChanged(m_animationSpeed); -} - -void QmlToolBar::setDesignModeBehavior(bool inDesignMode) -{ - m_emitSignals = false; - ui->designmode->setChecked(inDesignMode); - setDesignModeBehaviorOnClick(inDesignMode); - m_emitSignals = true; -} - -void QmlToolBar::setDesignModeBehaviorOnClick(bool checked) -{ - ui->select->setEnabled(checked); - ui->selectMarquee->setEnabled(checked); - ui->zoom->setEnabled(checked); - ui->colorPicker->setEnabled(checked); - ui->toQml->setEnabled(checked); - ui->fromQml->setEnabled(checked); - - if (m_emitSignals) - emit designModeBehaviorChanged(checked); -} - -void QmlToolBar::setColorBoxColor(const QColor &color) -{ - ui->colorBox->setColor(color); -} - -void QmlToolBar::activatePlayOnClick() -{ - m_paused = !m_paused; - emit animationPausedChanged(m_paused); - updatePlayAction(); -} - -void QmlToolBar::updatePlayAction() -{ - ui->play->setIcon(m_paused ? ui->playIcon : ui->pauseIcon); -} - -void QmlToolBar::activateColorPickerOnClick() -{ - ui->zoom->setChecked(false); - ui->select->setChecked(false); - ui->selectMarquee->setChecked(false); - - ui->colorPicker->setChecked(true); - if (m_activeTool != Constants::ColorPickerMode) { - m_activeTool = Constants::ColorPickerMode; - if (m_emitSignals) - emit colorPickerSelected(); - } -} - -void QmlToolBar::activateSelectToolOnClick() -{ - ui->zoom->setChecked(false); - ui->selectMarquee->setChecked(false); - ui->colorPicker->setChecked(false); - - ui->select->setChecked(true); - if (m_activeTool != Constants::SelectionToolMode) { - m_activeTool = Constants::SelectionToolMode; - if (m_emitSignals) - emit selectToolSelected(); - } -} - -void QmlToolBar::activateMarqueeSelectToolOnClick() -{ - ui->zoom->setChecked(false); - ui->select->setChecked(false); - ui->colorPicker->setChecked(false); - - ui->selectMarquee->setChecked(true); - if (m_activeTool != Constants::MarqueeSelectionToolMode) { - m_activeTool = Constants::MarqueeSelectionToolMode; - if (m_emitSignals) - emit marqueeSelectToolSelected(); - } -} - -void QmlToolBar::activateZoomOnClick() -{ - ui->select->setChecked(false); - ui->selectMarquee->setChecked(false); - ui->colorPicker->setChecked(false); - - ui->zoom->setChecked(true); - if (m_activeTool != Constants::ZoomMode) { - m_activeTool = Constants::ZoomMode; - if (m_emitSignals) - emit zoomToolSelected(); - } -} - -void QmlToolBar::activateFromQml() -{ - if (m_emitSignals) - emit applyChangesFromQmlFileSelected(); -} - -void QmlToolBar::activateToQml() -{ - if (m_emitSignals) - emit applyChangesToQmlFileSelected(); -} - -} // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.h b/src/plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.h deleted file mode 100644 index 3833ff28..00000000 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.h +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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 QMLTOOLBAR_H -#define QMLTOOLBAR_H - -#include <QtGui/QToolBar> -#include <QtGui/QIcon> - -#include "../qmlinspectorconstants.h" - -QT_FORWARD_DECLARE_CLASS(QActionGroup) - -namespace QmlJSDebugger { - -class ToolBarColorBox; - -class QmlToolBar : public QToolBar -{ - Q_OBJECT - -public: - explicit QmlToolBar(QWidget *parent = 0); - ~QmlToolBar(); - -public slots: - void setDesignModeBehavior(bool inDesignMode); - void setColorBoxColor(const QColor &color); - void activateColorPicker(); - void activateSelectTool(); - void activateMarqueeSelectTool(); - void activateZoom(); - - void setAnimationSpeed(qreal slowDownFactor); - void setAnimationPaused(bool paused); - -signals: - void animationSpeedChanged(qreal factor); - void animationPausedChanged(bool paused); - - void designModeBehaviorChanged(bool inDesignMode); - void colorPickerSelected(); - void selectToolSelected(); - void marqueeSelectToolSelected(); - void zoomToolSelected(); - - void applyChangesToQmlFileSelected(); - void applyChangesFromQmlFileSelected(); - -private slots: - void setDesignModeBehaviorOnClick(bool inDesignMode); - void activatePlayOnClick(); - void activateColorPickerOnClick(); - void activateSelectToolOnClick(); - void activateMarqueeSelectToolOnClick(); - void activateZoomOnClick(); - - void activateFromQml(); - void activateToQml(); - - void changeAnimationSpeed(); - - void updatePlayAction(); - -private: - class Ui { - public: - QAction *designmode; - QAction *play; - QAction *select; - QAction *selectMarquee; - QAction *zoom; - QAction *colorPicker; - QAction *toQml; - QAction *fromQml; - QIcon playIcon; - QIcon pauseIcon; - ToolBarColorBox *colorBox; - - QActionGroup *playSpeedMenuActions; - }; - - bool m_emitSignals; - bool m_paused; - qreal m_animationSpeed; - - Constants::DesignTool m_activeTool; - - Ui *ui; -}; - -} - -#endif // QMLTOOLBAR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp index 62b2799b..4e9e91fb 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp @@ -41,12 +41,13 @@ #include "subcomponentmasklayeritem.h" -#include "../qmlinspectorconstants.h" -#include "../qdeclarativeviewinspector.h" +#include "qmlinspectorconstants.h" +#include "qdeclarativeviewinspector.h" #include <QtGui/QPolygonF> 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/editor/subcomponentmasklayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h index 53864cc0..f9099f9e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h @@ -42,9 +42,10 @@ #ifndef SUBCOMPONENTMASKLAYERITEM_H #define SUBCOMPONENTMASKLAYERITEM_H -#include <QtGui/QGraphicsPolygonItem> +#include <QtWidgets/QGraphicsPolygonItem> 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/editor/toolbarcolorbox.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp deleted file mode 100644 index 6c56acd0..00000000 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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 "toolbarcolorbox.h" - -#include "../qmlinspectorconstants.h" - -#include <QtGui/QPixmap> -#include <QtGui/QPainter> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QColorDialog> -#include <QtGui/QDrag> - -#include <QtCore/QMimeData> -#include <QtCore/QDebug> - -namespace QmlJSDebugger { - -ToolBarColorBox::ToolBarColorBox(QWidget *parent) : - QLabel(parent) -{ - m_copyHexColor = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-hicontrast.png")), - tr("Copy Color"), this); - connect(m_copyHexColor, SIGNAL(triggered()), SLOT(copyColorToClipboard())); - setScaledContents(false); -} - -void ToolBarColorBox::setColor(const QColor &color) -{ - m_color = color; - - QPixmap pix = createDragPixmap(width()); - setPixmap(pix); - update(); -} - -void ToolBarColorBox::mousePressEvent(QMouseEvent *event) -{ - m_dragBeginPoint = event->pos(); - m_dragStarted = false; -} - -void ToolBarColorBox::mouseMoveEvent(QMouseEvent *event) -{ - - if (event->buttons() & Qt::LeftButton - && (QPoint(event->pos() - m_dragBeginPoint).manhattanLength() - > Constants::DragStartDistance) - && !m_dragStarted) - { - m_dragStarted = true; - QDrag *drag = new QDrag(this); - QMimeData *mimeData = new QMimeData; - - mimeData->setText(m_color.name()); - drag->setMimeData(mimeData); - drag->setPixmap(createDragPixmap()); - - drag->exec(); - } -} - -QPixmap ToolBarColorBox::createDragPixmap(int size) const -{ - QPixmap pix(size, size); - QPainter p(&pix); - - QColor borderColor1 = QColor(143, 143 ,143); - QColor borderColor2 = QColor(43, 43, 43); - - p.setBrush(QBrush(m_color)); - p.setPen(QPen(QBrush(borderColor2),1)); - - p.fillRect(0, 0, size, size, borderColor1); - p.drawRect(1,1, size - 3, size - 3); - return pix; -} - -void ToolBarColorBox::contextMenuEvent(QContextMenuEvent *ev) -{ - QMenu contextMenu; - contextMenu.addAction(m_copyHexColor); - contextMenu.exec(ev->globalPos()); -} - -void ToolBarColorBox::copyColorToClipboard() -{ - QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(m_color.name()); -} - -} // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h deleted file mode 100644 index bc39fb4a..00000000 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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 TOOLBARCOLORBOX_H -#define TOOLBARCOLORBOX_H - -#include <QtGui/QLabel> -#include <QtGui/QColor> -#include <QtCore/QPoint> - -QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) -QT_FORWARD_DECLARE_CLASS(QAction) - -namespace QmlJSDebugger { - -class ToolBarColorBox : public QLabel -{ - Q_OBJECT - -public: - explicit ToolBarColorBox(QWidget *parent = 0); - void setColor(const QColor &color); - -protected: - void contextMenuEvent(QContextMenuEvent *ev); - void mousePressEvent(QMouseEvent *ev); - void mouseMoveEvent(QMouseEvent *ev); -private slots: - void copyColorToClipboard(); - -private: - QPixmap createDragPixmap(int size = 24) const; - -private: - bool m_dragStarted; - QPoint m_dragBeginPoint; - QAction *m_copyHexColor; - QColor m_color; -}; - -} // namespace QmlJSDebugger - -#endif // TOOLBARCOLORBOX_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp index 3e41b3be..69d1f489 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp @@ -41,18 +41,19 @@ #include "zoomtool.h" -#include "../qdeclarativeviewinspector_p.h" +#include "qdeclarativeviewinspector_p.h" #include <QtGui/QMouseEvent> #include <QtGui/QWheelEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QtCore/QRectF> #include <QtCore/QDebug> namespace QmlJSDebugger { +namespace QtQuick1 { ZoomTool::ZoomTool(QDeclarativeViewInspector *view) : AbstractLiveEditTool(view), @@ -151,7 +152,7 @@ void ZoomTool::mouseReleaseEvent(QMouseEvent *event) view()->setSceneRect(sceneArea); } else { Qt::KeyboardModifier modifierKey = Qt::ControlModifier; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC modifierKey = Qt::AltModifier; #endif if (event->modifiers() & modifierKey) { @@ -244,9 +245,7 @@ void ZoomTool::keyReleaseEvent(QKeyEvent *event) void ZoomTool::clear() { -#ifndef QT_NO_CURSOR view()->setCursor(Qt::ArrowCursor); -#endif } void ZoomTool::scaleView(const QPointF ¢erPos) @@ -327,4 +326,5 @@ qreal ZoomTool::nextZoomScale(ZoomDirection direction) const return 1.0f; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h index d5c40553..76bf1892 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/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_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp index d8696c5f..0293b727 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp @@ -48,12 +48,11 @@ #include "editor/livelayeritem.h" #include "editor/boundingrecthighlighter.h" -#include <QtDeclarative/QDeclarativeItem> -#include <QtGui/QWidget> +#include <QtQuick1/QDeclarativeItem> #include <QtGui/QMouseEvent> -#include <QtGui/QGraphicsObject> namespace QmlJSDebugger { +namespace QtQuick1 { QDeclarativeViewInspectorPrivate::QDeclarativeViewInspectorPrivate(QDeclarativeViewInspector *q) : q(q) @@ -138,6 +137,17 @@ void QDeclarativeViewInspector::changeTool(InspectorProtocol::Tool tool) } } +Qt::WindowFlags QDeclarativeViewInspector::windowFlags() const +{ + return declarativeView()->window()->windowFlags(); +} + +void QDeclarativeViewInspector::setWindowFlags(Qt::WindowFlags flags) +{ + declarativeView()->window()->setWindowFlags(flags); + declarativeView()->window()->show(); +} + AbstractLiveEditTool *QDeclarativeViewInspector::currentTool() const { return static_cast<AbstractLiveEditTool*>(AbstractViewInspector::currentTool()); @@ -433,4 +443,5 @@ QRectF QDeclarativeViewInspector::adjustToScreenBoundaries(const QRectF &boundin return boundingRect; } +} // namespace QtQuick1 } // namespace QmlJSDebugger diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h index 5fbf6c6a..398ae889 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h @@ -44,13 +44,13 @@ #include <private/qdeclarativeglobal_p.h> -#include "qmlinspectorconstants.h" #include "abstractviewinspector.h" #include <QtCore/QScopedPointer> -#include <QtDeclarative/QDeclarativeView> +#include <QtQuick1/QDeclarativeView> namespace QmlJSDebugger { +namespace QtQuick1 { class AbstractLiveEditTool; class QDeclarativeViewInspectorPrivate; @@ -68,7 +68,8 @@ public: void reloadView(); void reparentQmlObject(QObject *object, QObject *newParent); void changeTool(InspectorProtocol::Tool tool); - QWidget *viewWidget() const { return declarativeView(); } + Qt::WindowFlags windowFlags() const; + void setWindowFlags(Qt::WindowFlags flags); QDeclarativeEngine *declarativeEngine() const; void setSelectedItems(QList<QGraphicsItem *> items); @@ -95,6 +96,7 @@ private: friend class AbstractLiveEditTool; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // QDECLARATIVEVIEWINSPECTOR_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h index 7093e4fc..48c09aa8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h @@ -44,12 +44,15 @@ #include "qdeclarativeviewinspector.h" +#include <QtCore/QScopedPointer> +#include <QtQuick1/QDeclarativeView> #include <QtCore/QWeakPointer> #include <QtCore/QPointF> -#include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" +#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> namespace QmlJSDebugger { +namespace QtQuick1 { class QDeclarativeViewInspector; class LiveSelectionTool; @@ -112,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_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index e441a781..629cade1 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,14 +1,14 @@ TARGET = qmldbg_inspector -QT += declarative +QT += quick1 quick1-private gui widgets core-private include(../../qpluginbase.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" +QTDIR_build:REQUIRES += "contains(QT_CONFIG, quick1)" SOURCES += \ + qtquick1plugin.cpp \ abstractviewinspector.cpp \ - qdeclarativeinspectorplugin.cpp \ qdeclarativeviewinspector.cpp \ editor/abstractliveedittool.cpp \ editor/liveselectiontool.cpp \ @@ -24,8 +24,8 @@ SOURCES += \ abstracttool.cpp HEADERS += \ + qtquick1plugin.h \ abstractviewinspector.h \ - qdeclarativeinspectorplugin.h \ qdeclarativeinspectorprotocol.h \ qdeclarativeviewinspector.h \ qdeclarativeviewinspector_p.h \ diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h index 7377bc65..93c12ea8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h @@ -42,7 +42,7 @@ #ifndef QMLINSPECTORCONSTANTS_H #define QMLINSPECTORCONSTANTS_H -#include <QtDeclarative/private/qdeclarativeglobal_p.h> +#include <QtQuick1/private/qdeclarativeglobal_p.h> namespace QmlJSDebugger { namespace Constants { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp index 1b74caf7..2008338a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp @@ -39,26 +39,32 @@ ** ****************************************************************************/ -#include "qdeclarativeinspectorplugin.h" - -#include "qdeclarativeviewinspector_p.h" +#include "qtquick1plugin.h" +#include "qdeclarativeviewinspector.h" #include <QtCore/qplugin.h> -#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> +#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> +#include <QtQuick1/qdeclarativeview.h> namespace QmlJSDebugger { +namespace QtQuick1 { -QDeclarativeInspectorPlugin::QDeclarativeInspectorPlugin() : +QtQuick1Plugin::QtQuick1Plugin() : m_inspector(0) { } -QDeclarativeInspectorPlugin::~QDeclarativeInspectorPlugin() +QtQuick1Plugin::~QtQuick1Plugin() { delete m_inspector; } -void QDeclarativeInspectorPlugin::activate() +bool QtQuick1Plugin::canHandleView(QObject *view) +{ + return qobject_cast<QDeclarativeView*>(view); +} + +void QtQuick1Plugin::activate() { QDeclarativeInspectorService *service = QDeclarativeInspectorService::instance(); QList<QDeclarativeView*> views = service->views(); @@ -70,11 +76,18 @@ void QDeclarativeInspectorPlugin::activate() m_inspector = new QDeclarativeViewInspector(view, view); } -void QDeclarativeInspectorPlugin::deactivate() +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(declarativeinspector, QmlJSDebugger::QDeclarativeInspectorPlugin) +Q_EXPORT_PLUGIN2(qmldbg_qtquick1, QmlJSDebugger::QtQuick1::QtQuick1Plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h index a910edcb..902306b2 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h @@ -43,29 +43,35 @@ #define QDECLARATIVEINSPECTORPLUGIN_H #include <QtCore/QPointer> -#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h> +#include <QtQuick1/private/qdeclarativeinspectorinterface_p.h> 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(); + // QDeclarativeInspectorInterface + bool canHandleView(QObject *view); void activate(); void deactivate(); + void clientMessage(const QByteArray &message); private: QPointer<AbstractViewInspector> m_inspector; }; +} // namespace QtQuick1 } // namespace QmlJSDebugger #endif // QDECLARATIVEINSPECTORPLUGIN_H |