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

Analyzer: Set dockwidget title on inner widget first

Browse Source 
Will be promoted to dockwidget title by the fancy mainwindow.

Change-Id: Idbb4d2869c254140a241cd5a8f5b75b3ef739692
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-07-23 16:07:39 +02:00
parent 089e690108
commit 7bb3f728ef
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,14 +624,13 @@ void AnalyzerManager::addAction(AnalyzerAction *action)
d->addAction(action); d->addAction(action);
} }
QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, const QString &title, QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool,
QWidget *widget, Qt::DockWidgetArea area) QWidget *widget, Qt::DockWidgetArea area)
{ {
QTC_ASSERT(!widget->objectName().isEmpty(), return 0); QTC_ASSERT(!widget->objectName().isEmpty(), return 0);
QDockWidget *dockWidget = d->m_mainWindow->addDockForWidget(widget); QDockWidget *dockWidget = d->m_mainWindow->addDockForWidget(widget);
dockWidget->setProperty(INITIAL_DOCK_AREA, int(area)); dockWidget->setProperty(INITIAL_DOCK_AREA, int(area));
d->m_dockWidgets.append(AnalyzerManagerPrivate::DockPtr(dockWidget)); d->m_dockWidgets.append(AnalyzerManagerPrivate::DockPtr(dockWidget));
dockWidget->setWindowTitle(title);
d->m_toolWidgets[tool].push_back(dockWidget); d->m_toolWidgets[tool].push_back(dockWidget);
return dockWidget; return dockWidget;
} }

2
src/plugins/analyzerbase/analyzermanager.h
View File

@@ -69,7 +69,7 @@ public:
static void addAction(AnalyzerAction *action); static void addAction(AnalyzerAction *action);
// Dockwidgets are registered to the main window. // Dockwidgets are registered to the main window.
static QDockWidget *createDockWidget(IAnalyzerTool *tool, const QString &title, static QDockWidget *createDockWidget(IAnalyzerTool *tool,
QWidget *widget, Qt::DockWidgetArea area = Qt::TopDockWidgetArea); QWidget *widget, Qt::DockWidgetArea area = Qt::TopDockWidgetArea);
static Utils::FancyMainWindow *mainWindow(); static Utils::FancyMainWindow *mainWindow();

11
src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
View File

@@ -96,6 +96,7 @@ void QmlProfilerViewManager::createViews()
this, this,
d->profilerModelManager, d->profilerModelManager,
d->profilerState); d->profilerState);
d->traceView->setWindowTitle(tr("Timeline"));
connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)), connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)),
this, SIGNAL(gotoSourceLocation(QString,int,int))); this, SIGNAL(gotoSourceLocation(QString,int,int)));
d->traceView->reset(); d->traceView->reset();
@@ -103,6 +104,7 @@ void QmlProfilerViewManager::createViews()
d->eventsView = new QmlProfilerEventsWidget(mw, d->profilerTool, this, d->eventsView = new QmlProfilerEventsWidget(mw, d->profilerTool, this,
d->profilerModelManager); d->profilerModelManager);
d->eventsView->setWindowTitle(tr("Events"));
connect(d->eventsView, SIGNAL(gotoSourceLocation(QString,int,int)), this, connect(d->eventsView, SIGNAL(gotoSourceLocation(QString,int,int)), this,
SIGNAL(gotoSourceLocation(QString,int,int))); SIGNAL(gotoSourceLocation(QString,int,int)));
connect(d->eventsView, SIGNAL(eventSelectedByTypeIndex(int)), connect(d->eventsView, SIGNAL(eventSelectedByTypeIndex(int)),
@@ -112,6 +114,7 @@ void QmlProfilerViewManager::createViews()
d->v8profilerView = new QV8ProfilerEventsWidget(mw, d->profilerTool, this, d->v8profilerView = new QV8ProfilerEventsWidget(mw, d->profilerTool, this,
d->profilerModelManager); d->profilerModelManager);
d->v8profilerView->setWindowTitle(tr("JavaScript"));
connect(d->v8profilerView, SIGNAL(gotoSourceLocation(QString,int,int)), this, connect(d->v8profilerView, SIGNAL(gotoSourceLocation(QString,int,int)), this,
SIGNAL(gotoSourceLocation(QString,int,int))); SIGNAL(gotoSourceLocation(QString,int,int)));
connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)), connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)),
@@ -124,11 +127,11 @@ void QmlProfilerViewManager::createViews()
d->v8profilerView, SLOT(selectBySourceLocation(QString,int,int))); d->v8profilerView, SLOT(selectBySourceLocation(QString,int,int)));
QDockWidget *eventsDock = AnalyzerManager::createDockWidget QDockWidget *eventsDock = AnalyzerManager::createDockWidget
(d->profilerTool, tr("Events"), d->eventsView, Qt::BottomDockWidgetArea); (d->profilerTool, d->eventsView, Qt::BottomDockWidgetArea);
QDockWidget *timelineDock = AnalyzerManager::createDockWidget QDockWidget *timelineDock = AnalyzerManager::createDockWidget
(d->profilerTool, tr("Timeline"), d->traceView, Qt::BottomDockWidgetArea); (d->profilerTool, d->traceView, Qt::BottomDockWidgetArea);
QDockWidget *v8profilerDock = AnalyzerManager::createDockWidget( QDockWidget *v8profilerDock = AnalyzerManager::createDockWidget
d->profilerTool, tr("JavaScript"), d->v8profilerView, Qt::BottomDockWidgetArea); (d->profilerTool, d->v8profilerView, Qt::BottomDockWidgetArea);
eventsDock->show(); eventsDock->show();
timelineDock->show(); timelineDock->show();

12
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -596,12 +596,14 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_visualisation = new Visualisation(mw); m_visualisation = new Visualisation(mw);
m_visualisation->setFrameStyle(QFrame::NoFrame); m_visualisation->setFrameStyle(QFrame::NoFrame);
m_visualisation->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation")); m_visualisation->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation"));
m_visualisation->setWindowTitle(tr("Visualization"));
m_visualisation->setModel(m_dataModel); m_visualisation->setModel(m_dataModel);
connect(m_visualisation, SIGNAL(functionActivated(const Valgrind::Callgrind::Function*)), connect(m_visualisation, SIGNAL(functionActivated(const Valgrind::Callgrind::Function*)),
this, SLOT(visualisationFunctionSelected(const Valgrind::Callgrind::Function*))); this, SLOT(visualisationFunctionSelected(const Valgrind::Callgrind::Function*)));
m_callersView = new CostView(mw); m_callersView = new CostView(mw);
m_callersView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CallersView")); m_callersView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CallersView"));
m_callersView->setWindowTitle(tr("Callers"));
m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView"); m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView");
m_callersView->sortByColumn(CallModel::CostColumn); m_callersView->sortByColumn(CallModel::CostColumn);
m_callersView->setFrameStyle(QFrame::NoFrame); m_callersView->setFrameStyle(QFrame::NoFrame);
@@ -615,6 +617,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_calleesView = new CostView(mw); m_calleesView = new CostView(mw);
m_calleesView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CalleesView")); m_calleesView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CalleesView"));
m_calleesView->setWindowTitle(tr("Callees"));
m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView"); m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView");
m_calleesView->sortByColumn(CallModel::CostColumn); m_calleesView->sortByColumn(CallModel::CostColumn);
m_calleesView->setFrameStyle(QFrame::NoFrame); m_calleesView->setFrameStyle(QFrame::NoFrame);
@@ -628,6 +631,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_flatView = new CostView(mw); m_flatView = new CostView(mw);
m_flatView->setObjectName(QLatin1String("Valgrind.CallgrindTool.FlatView")); m_flatView->setObjectName(QLatin1String("Valgrind.CallgrindTool.FlatView"));
m_flatView->setWindowTitle(tr("Functions"));
m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView"); m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView");
m_flatView->sortByColumn(DataModel::SelfCostColumn); m_flatView->sortByColumn(DataModel::SelfCostColumn);
m_flatView->setFrameStyle(QFrame::NoFrame); m_flatView->setFrameStyle(QFrame::NoFrame);
@@ -639,16 +643,16 @@ QWidget *CallgrindToolPrivate::createWidgets()
updateCostFormat(); updateCostFormat();
QDockWidget *callersDock = AnalyzerManager::createDockWidget QDockWidget *callersDock = AnalyzerManager::createDockWidget
(q, tr("Callers"), m_callersView, Qt::BottomDockWidgetArea); (q, m_callersView, Qt::BottomDockWidgetArea);
QDockWidget *flatDock = AnalyzerManager::createDockWidget QDockWidget *flatDock = AnalyzerManager::createDockWidget
(q, tr("Functions"), m_flatView, Qt::BottomDockWidgetArea); (q, m_flatView, Qt::BottomDockWidgetArea);
QDockWidget *calleesDock = AnalyzerManager::createDockWidget QDockWidget *calleesDock = AnalyzerManager::createDockWidget
(q, tr("Callees"), m_calleesView, Qt::BottomDockWidgetArea); (q, m_calleesView, Qt::BottomDockWidgetArea);
QDockWidget *visualizationDock = AnalyzerManager::createDockWidget QDockWidget *visualizationDock = AnalyzerManager::createDockWidget
(q, tr("Visualization"), m_visualisation, Qt::RightDockWidgetArea); (q, m_visualisation, Qt::RightDockWidgetArea);
callersDock->show(); callersDock->show();
calleesDock->show(); calleesDock->show();

3
src/plugins/valgrind/memchecktool.cpp
View File

@@ -364,9 +364,10 @@ QWidget *MemcheckTool::createWidgets()
m_errorView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); m_errorView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
m_errorView->setAutoScroll(false); m_errorView->setAutoScroll(false);
m_errorView->setObjectName(QLatin1String("Valgrind.MemcheckTool.ErrorView")); m_errorView->setObjectName(QLatin1String("Valgrind.MemcheckTool.ErrorView"));
m_errorView->setWindowTitle(tr("Memory Issues"));
QDockWidget *errorDock = AnalyzerManager::createDockWidget QDockWidget *errorDock = AnalyzerManager::createDockWidget
(this, tr("Memory Issues"), m_errorView, Qt::BottomDockWidgetArea); (this, m_errorView, Qt::BottomDockWidgetArea);
errorDock->show(); errorDock->show();
mw->splitDockWidget(mw->toolBarDockWidget(), errorDock, Qt::Vertical); mw->splitDockWidget(mw->toolBarDockWidget(), errorDock, Qt::Vertical);