feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Analyzer: Introduce delayed initialization of docks.

Browse Source 
Introduce AnalzyerTool::initializeDockWidgets to do that.
Work around exit crash in callgrind.
This commit is contained in:
Friedemann Kleint
2011-05-06 17:26:01 +02:00
parent 1cedb84bc2
commit 4d113c9b4b
8 changed files with 117 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/analyzerbase/analyzermanager.cpp
View File

@@ -167,12 +167,11 @@ public:
struct ToolDockWidgetData
{
ToolDockWidgetData(Qt::DockWidgetArea a, QDockWidget *w, QDockWidget *t) :
area(a), widget(w), tabifyTo(t) {}
ToolDockWidgetData(Qt::DockWidgetArea a, QDockWidget *w) :
area(a), widget(w) {}
Qt::DockWidgetArea area;
QDockWidget *widget;
QDockWidget *tabifyTo;
};
} // namespace Internal
} // namespace Analyzer
@@ -684,14 +683,13 @@ void AnalyzerManager::toolSelected(int idx)
d->m_controlsWidget->setCurrentIndex(idx);
const bool firstTime = !d->m_defaultSettings.contains(newTool);
foreach (const ToolDockWidgetData &widget, d->m_toolWidgets.value(newTool)) {
d->addDock(newTool, widget.area, widget.widget);
if (firstTime && widget.tabifyTo)
d->m_mainWindow->tabifyDockWidget(widget.tabifyTo, widget.widget);
}
if (firstTime) // Save default settings first time
if (firstTime) {
newTool->initializeDockWidgets();
d->m_defaultSettings.insert(newTool, d->m_mainWindow->saveSettings());
} else {
foreach (const ToolDockWidgetData &widget, d->m_toolWidgets.value(newTool))
d->addDock(newTool, widget.area, widget.widget);
}
loadToolSettings(newTool);
d->m_outputpane->setTool(newTool);
@@ -744,8 +742,7 @@ void AnalyzerManager::addTool(IAnalyzerTool *tool)
}
QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, const QString &title,
QWidget *widget, Qt::DockWidgetArea area,
QDockWidget *tabifyTo)
QWidget *widget, Qt::DockWidgetArea area)
{
QTC_ASSERT(!widget->objectName().isEmpty(), return 0;);
@@ -753,7 +750,8 @@ QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, const QStrin
d->m_dockWidgets << AnalyzerManagerPrivate::DockPtr(dockWidget);
dockWidget->setWindowTitle(title);
d->m_toolWidgets[tool].push_back(ToolDockWidgetData(area, dockWidget, tabifyTo));
d->m_toolWidgets[tool].push_back(ToolDockWidgetData(area, dockWidget));
d->addDock(tool, area, dockWidget);
dockWidget->installEventFilter(d->m_resizeEventFilter);
return dockWidget;
}