diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-07-13 09:27:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-07-13 09:29:34 +0200 |
| commit | d7c2c23da81bad0ee0838112b6359027b5f6fe25 (patch) | |
| tree | 6827c0c13c9808ab1b28cf6cbfbc58f5fcafe639 | |
| parent | 85bdf3ece30a7afd39f06cca8267246fa2a6730b (diff) | |
Fix initial layout in analyze mode.v2.3.0-beta
Task-number: QTCREATORBUG-5414
Change-Id: I4ac8d150f20e35a769e6f7f13db420d81e93e7e2
Reviewed-on: http://codereview.qt.nokia.com/1552
Reviewed-by: hjk <qthjk@ovi.com>
| -rw-r--r-- | src/plugins/analyzerbase/analyzermanager.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertool.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 0963ac89ec..9a2ef188c4 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -616,9 +616,15 @@ void AnalyzerManagerPrivate::selectSavedTool() StartMode mode = m_modeFromAction.value(action); if (tool->actionId(mode) == lastActiveAction) { selectTool(tool, mode); - break; + return; } } + // fallback to first available tool + if (!m_actions.isEmpty()) { + IAnalyzerTool *tool = m_toolFromAction.value(m_actions.first()); + StartMode mode = m_modeFromAction.value(m_actions.first()); + selectTool(tool, mode); + } } void AnalyzerManagerPrivate::selectMenuAction() @@ -727,6 +733,8 @@ void AnalyzerManagerPrivate::loadToolSettings(IAnalyzerTool *tool) settings->beginGroup(QLatin1String("AnalyzerViewSettings_") + tool->id()); if (settings->value("ToolSettingsSaved", false).toBool()) m_mainWindow->restoreSettings(settings); + else + m_mainWindow->restoreSettings(m_defaultSettings.value(tool)); settings->endGroup(); } diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index fd004b7ae0..18c14c2095 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -76,6 +76,7 @@ #include <QtGui/QTabWidget> #include <QtGui/QToolButton> #include <QtGui/QMessageBox> +#include <QtGui/QDockWidget> using namespace Analyzer; using namespace QmlProfiler::Internal; @@ -295,6 +296,11 @@ QWidget *QmlProfilerTool::createWidgets() QDockWidget *callerDock = AnalyzerManager::createDockWidget (this, tr("Callers"), d->m_callerView, Qt::BottomDockWidgetArea); + eventsDock->show(); + timelineDock->show(); + calleeDock->show(); + callerDock->show(); + mw->splitDockWidget(mw->toolBarDockWidget(), eventsDock, Qt::Vertical); mw->tabifyDockWidget(eventsDock, timelineDock); mw->tabifyDockWidget(timelineDock, calleeDock); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index db2991acae..363b1c5bad 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -380,6 +380,7 @@ QWidget *MemcheckTool::createWidgets() QDockWidget *errorDock = AnalyzerManager::createDockWidget (this, tr("Memory Issues"), m_errorView, Qt::BottomDockWidgetArea); + errorDock->show(); mw->splitDockWidget(mw->toolBarDockWidget(), errorDock, Qt::Vertical); connect(ProjectExplorer::ProjectExplorerPlugin::instance(), |