diff options
author | Aurindam Jana <aurindam.jana@digia.com> | 2012-11-27 15:15:27 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2012-12-11 10:05:45 +0100 |
commit | 1b916719d076114a01d509303a591e45863ed3d0 (patch) | |
tree | 503e190435b1b86798a16050e61d6520c07499d6 /src/plugins/debugger/qml/qmlinspectoradapter.h | |
parent | 3271af9292060d60af32d8364287dabd73e02a35 (diff) | |
download | qt-creator-1b916719d076114a01d509303a591e45863ed3d0.tar.gz |
Inspector: Enable/disable tools on engine state
On a debug break, inspector tools cannot be used as the
gui thread is blocked.
Task-number: QTCREATORBUG-5466
Change-Id: I808d751b1ade7e4a5c98e87fec7bb4cb02715ad8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlinspectoradapter.h')
-rw-r--r-- | src/plugins/debugger/qml/qmlinspectoradapter.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index e6c5d4d195..e9d9cd7866 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -30,6 +30,8 @@ #ifndef QMLINSPECTORADAPTER_H #define QMLINSPECTORADAPTER_H +#include "debuggerconstants.h" + #include <QObject> #include <QStringList> @@ -49,11 +51,13 @@ class FileReference; } namespace Debugger { + +class DebuggerEngine; + namespace Internal { class WatchTreeView; class QmlAdapter; -class QmlEngine; class QmlInspectorAgent; class QmlLiveTextPreview; @@ -62,7 +66,7 @@ class QmlInspectorAdapter : public QObject Q_OBJECT public: - QmlInspectorAdapter(QmlAdapter *debugAdapter, QmlEngine *engine, + QmlInspectorAdapter(QmlAdapter *debugAdapter, DebuggerEngine *engine, QObject *parent = 0); ~QmlInspectorAdapter(); @@ -78,6 +82,8 @@ signals: void selectionChanged(); private slots: + void onEngineStateChanged(const Debugger::DebuggerState); + void clientStatusChanged(QmlDebug::ClientStatus status); void toolsClientStatusChanged(QmlDebug::ClientStatus status); void engineClientStatusChanged(QmlDebug::ClientStatus status); @@ -89,10 +95,10 @@ private slots: void removePreviewForEditor(Core::IEditor *editor); void updatePendingPreviewDocuments(QmlJS::Document::Ptr doc); - void onSelectActionTriggered(bool checked); - void onZoomActionTriggered(bool checked); - void onShowAppOnTopChanged(const QVariant &value); - void onUpdateOnSaveChanged(const QVariant &value); + void onSelectActionTriggered(const bool checked); + void onZoomActionTriggered(const bool checked); + void onShowAppOnTopChanged(const bool checked); + void onUpdateOnSaveChanged(const bool checked); void onReload(); void onReloaded(); void onDestroyedObject(int); @@ -110,9 +116,10 @@ private: SelectionTarget target); void deletePreviews(); + void enableTools(const bool enable); QmlAdapter *m_debugAdapter; - QmlEngine *m_engine; + DebuggerEngine *m_engine; // Master Engine QmlDebug::BaseEngineDebugClient *m_engineClient; QHash<QString, QmlDebug::BaseEngineDebugClient*> m_engineClients; QmlDebug::BaseToolsClient *m_toolsClient; @@ -135,6 +142,8 @@ private: Core::Context m_inspectorToolsContext; QAction *m_selectAction; QAction *m_zoomAction; + QAction *m_showAppOnTopAction; + QAction *m_updateOnSaveAction; bool m_engineClientConnected; }; |