Commit a74f4949 authored by con's avatar con
Browse files

Add a menu item for the Locals and Watchers panel.


Reviewed-by: default avatarhjk <qtc-committer@nokia.com>
parent 900ec2aa
...@@ -430,6 +430,14 @@ void DebuggerManager::init() ...@@ -430,6 +430,14 @@ void DebuggerManager::init()
m_threadsDock = createDockForWidget(m_threadsWindow); m_threadsDock = createDockForWidget(m_threadsWindow);
QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
localsAndWatchers->addWidget(m_localsWindow);
localsAndWatchers->addWidget(m_watchersWindow);
localsAndWatchers->setStretchFactor(0, 3);
localsAndWatchers->setStretchFactor(1, 1);
m_watchDock = createDockForWidget(localsAndWatchers);
setStatus(DebuggerProcessNotReady); setStatus(DebuggerProcessNotReady);
} }
...@@ -457,17 +465,6 @@ IDebuggerManagerAccessForEngines *DebuggerManager::engineInterface() ...@@ -457,17 +465,6 @@ IDebuggerManagerAccessForEngines *DebuggerManager::engineInterface()
return dynamic_cast<IDebuggerManagerAccessForEngines *>(this); return dynamic_cast<IDebuggerManagerAccessForEngines *>(this);
} }
void DebuggerManager::createDockWidgets()
{
QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
localsAndWatchers->addWidget(m_localsWindow);
localsAndWatchers->addWidget(m_watchersWindow);
localsAndWatchers->setStretchFactor(0, 3);
localsAndWatchers->setStretchFactor(1, 1);
m_watchDock = createDockForWidget(localsAndWatchers);
}
void DebuggerManager::createNewDock(QWidget *widget) void DebuggerManager::createNewDock(QWidget *widget)
{ {
QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow); QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow);
......
...@@ -316,7 +316,6 @@ private: ...@@ -316,7 +316,6 @@ private:
// //
QWidget *threadsWindow() const { return m_threadsWindow; } QWidget *threadsWindow() const { return m_threadsWindow; }
QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; } QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; }
void createDockWidgets();
virtual bool qtDumperLibraryEnabled() const; virtual bool qtDumperLibraryEnabled() const;
virtual QString qtDumperLibraryName() const; virtual QString qtDumperLibraryName() const;
......
...@@ -173,10 +173,6 @@ class DebugMode : public Core::BaseMode ...@@ -173,10 +173,6 @@ class DebugMode : public Core::BaseMode
public: public:
DebugMode(QObject *parent = 0); DebugMode(QObject *parent = 0);
~DebugMode(); ~DebugMode();
// IMode
void activated() {}
void shutdown() {}
}; };
DebugMode::DebugMode(QObject *parent) DebugMode::DebugMode(QObject *parent)
...@@ -409,8 +405,6 @@ DebuggerPlugin::~DebuggerPlugin() ...@@ -409,8 +405,6 @@ DebuggerPlugin::~DebuggerPlugin()
void DebuggerPlugin::shutdown() void DebuggerPlugin::shutdown()
{ {
if (m_debugMode)
m_debugMode->shutdown(); // saves state including manager information
QTC_ASSERT(m_manager, /**/); QTC_ASSERT(m_manager, /**/);
if (m_manager) if (m_manager)
m_manager->shutdown(); m_manager->shutdown();
...@@ -758,7 +752,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess ...@@ -758,7 +752,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
toolBarAddingLayout->addWidget(rightPaneSplitter); toolBarAddingLayout->addWidget(rightPaneSplitter);
toolBarAddingLayout->addWidget(debugToolBar); toolBarAddingLayout->addWidget(debugToolBar);
m_manager->createDockWidgets();
m_manager->setSimpleDockWidgetArrangement(); m_manager->setSimpleDockWidgetArrangement();
readSettings(); readSettings();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment