From 7bb3f728ef583c7ae9a6717a3816f785a914c9c2 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 23 Jul 2014 16:07:39 +0200 Subject: [PATCH] Analyzer: Set dockwidget title on inner widget first Will be promoted to dockwidget title by the fancy mainwindow. Change-Id: Idbb4d2869c254140a241cd5a8f5b75b3ef739692 Reviewed-by: Eike Ziller --- src/plugins/analyzerbase/analyzermanager.cpp | 3 +-- src/plugins/analyzerbase/analyzermanager.h | 2 +- src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp | 11 +++++++---- src/plugins/valgrind/callgrindtool.cpp | 12 ++++++++---- src/plugins/valgrind/memchecktool.cpp | 3 ++- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index afb06ab464d..0de28c728d8 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -624,14 +624,13 @@ void AnalyzerManager::addAction(AnalyzerAction *action) d->addAction(action); } -QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, const QString &title, +QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, QWidget *widget, Qt::DockWidgetArea area) { QTC_ASSERT(!widget->objectName().isEmpty(), return 0); QDockWidget *dockWidget = d->m_mainWindow->addDockForWidget(widget); dockWidget->setProperty(INITIAL_DOCK_AREA, int(area)); d->m_dockWidgets.append(AnalyzerManagerPrivate::DockPtr(dockWidget)); - dockWidget->setWindowTitle(title); d->m_toolWidgets[tool].push_back(dockWidget); return dockWidget; } diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h index 2ba0764e652..6b5c61b6364 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -69,7 +69,7 @@ public: static void addAction(AnalyzerAction *action); // 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); static Utils::FancyMainWindow *mainWindow(); diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp index b4c59360b22..58e1e1b4485 100644 --- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp @@ -96,6 +96,7 @@ void QmlProfilerViewManager::createViews() this, d->profilerModelManager, d->profilerState); + d->traceView->setWindowTitle(tr("Timeline")); connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)), this, SIGNAL(gotoSourceLocation(QString,int,int))); d->traceView->reset(); @@ -103,6 +104,7 @@ void QmlProfilerViewManager::createViews() d->eventsView = new QmlProfilerEventsWidget(mw, d->profilerTool, this, d->profilerModelManager); + d->eventsView->setWindowTitle(tr("Events")); connect(d->eventsView, SIGNAL(gotoSourceLocation(QString,int,int)), this, SIGNAL(gotoSourceLocation(QString,int,int))); connect(d->eventsView, SIGNAL(eventSelectedByTypeIndex(int)), @@ -112,6 +114,7 @@ void QmlProfilerViewManager::createViews() d->v8profilerView = new QV8ProfilerEventsWidget(mw, d->profilerTool, this, d->profilerModelManager); + d->v8profilerView->setWindowTitle(tr("JavaScript")); connect(d->v8profilerView, SIGNAL(gotoSourceLocation(QString,int,int)), this, 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))); QDockWidget *eventsDock = AnalyzerManager::createDockWidget - (d->profilerTool, tr("Events"), d->eventsView, Qt::BottomDockWidgetArea); + (d->profilerTool, d->eventsView, Qt::BottomDockWidgetArea); QDockWidget *timelineDock = AnalyzerManager::createDockWidget - (d->profilerTool, tr("Timeline"), d->traceView, Qt::BottomDockWidgetArea); - QDockWidget *v8profilerDock = AnalyzerManager::createDockWidget( - d->profilerTool, tr("JavaScript"), d->v8profilerView, Qt::BottomDockWidgetArea); + (d->profilerTool, d->traceView, Qt::BottomDockWidgetArea); + QDockWidget *v8profilerDock = AnalyzerManager::createDockWidget + (d->profilerTool, d->v8profilerView, Qt::BottomDockWidgetArea); eventsDock->show(); timelineDock->show(); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 6aec7c97095..5d034becff3 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -596,12 +596,14 @@ QWidget *CallgrindToolPrivate::createWidgets() m_visualisation = new Visualisation(mw); m_visualisation->setFrameStyle(QFrame::NoFrame); m_visualisation->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation")); + m_visualisation->setWindowTitle(tr("Visualization")); m_visualisation->setModel(m_dataModel); connect(m_visualisation, SIGNAL(functionActivated(const Valgrind::Callgrind::Function*)), this, SLOT(visualisationFunctionSelected(const Valgrind::Callgrind::Function*))); m_callersView = new CostView(mw); m_callersView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CallersView")); + m_callersView->setWindowTitle(tr("Callers")); m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView"); m_callersView->sortByColumn(CallModel::CostColumn); m_callersView->setFrameStyle(QFrame::NoFrame); @@ -615,6 +617,7 @@ QWidget *CallgrindToolPrivate::createWidgets() m_calleesView = new CostView(mw); m_calleesView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CalleesView")); + m_calleesView->setWindowTitle(tr("Callees")); m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView"); m_calleesView->sortByColumn(CallModel::CostColumn); m_calleesView->setFrameStyle(QFrame::NoFrame); @@ -628,6 +631,7 @@ QWidget *CallgrindToolPrivate::createWidgets() m_flatView = new CostView(mw); m_flatView->setObjectName(QLatin1String("Valgrind.CallgrindTool.FlatView")); + m_flatView->setWindowTitle(tr("Functions")); m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView"); m_flatView->sortByColumn(DataModel::SelfCostColumn); m_flatView->setFrameStyle(QFrame::NoFrame); @@ -639,16 +643,16 @@ QWidget *CallgrindToolPrivate::createWidgets() updateCostFormat(); QDockWidget *callersDock = AnalyzerManager::createDockWidget - (q, tr("Callers"), m_callersView, Qt::BottomDockWidgetArea); + (q, m_callersView, Qt::BottomDockWidgetArea); QDockWidget *flatDock = AnalyzerManager::createDockWidget - (q, tr("Functions"), m_flatView, Qt::BottomDockWidgetArea); + (q, m_flatView, Qt::BottomDockWidgetArea); QDockWidget *calleesDock = AnalyzerManager::createDockWidget - (q, tr("Callees"), m_calleesView, Qt::BottomDockWidgetArea); + (q, m_calleesView, Qt::BottomDockWidgetArea); QDockWidget *visualizationDock = AnalyzerManager::createDockWidget - (q, tr("Visualization"), m_visualisation, Qt::RightDockWidgetArea); + (q, m_visualisation, Qt::RightDockWidgetArea); callersDock->show(); calleesDock->show(); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 41741a22355..74f787a3963 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -364,9 +364,10 @@ QWidget *MemcheckTool::createWidgets() m_errorView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); m_errorView->setAutoScroll(false); m_errorView->setObjectName(QLatin1String("Valgrind.MemcheckTool.ErrorView")); + m_errorView->setWindowTitle(tr("Memory Issues")); QDockWidget *errorDock = AnalyzerManager::createDockWidget - (this, tr("Memory Issues"), m_errorView, Qt::BottomDockWidgetArea); + (this, m_errorView, Qt::BottomDockWidgetArea); errorDock->show(); mw->splitDockWidget(mw->toolBarDockWidget(), errorDock, Qt::Vertical);