From 29e312f33e75c2cc40a755803593e389cd0d12ca Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 16 Jul 2014 16:32:11 +0200 Subject: Debugger: Save width of manually resized tree view columns Task-number: QTCREATORBUG-12670 Change-Id: I5c31ffd6d3bb3060e851df56e9d9a80101df9347 Reviewed-by: Alessandro Portale --- src/plugins/debugger/debuggerplugin.cpp | 16 +++++++++++++--- src/plugins/valgrind/callgrindtool.cpp | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 76abafbbb4..284b513a45 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -834,7 +834,6 @@ public slots: m_returnView->header()->resizeSection(section, newSize); } - void sourceFilesDockToggled(bool on) { if (on && m_currentEngine->state() == InferiorStopOk) @@ -2762,6 +2761,8 @@ void DebuggerPluginPrivate::extensionsInitialized() { const QKeySequence debugKey = QKeySequence(UseMacShortcuts ? tr("Ctrl+Y") : tr("F5")); + QSettings *settings = Core::ICore::settings(); + m_debuggerSettings = new DebuggerSettings; m_debuggerSettings->readSettings(); @@ -2794,39 +2795,48 @@ void DebuggerPluginPrivate::extensionsInitialized() m_breakHandler = new BreakHandler; m_breakView = new BreakTreeView; + m_breakView->setSettings(settings, "Debugger.BreakWindow"); m_breakView->setModel(m_breakHandler->model()); m_breakWindow = addSearch(m_breakView, tr("Breakpoints"), DOCKWIDGET_BREAK); m_modulesView = new ModulesTreeView; + m_modulesView->setSettings(settings, "Debugger.ModulesView"); m_modulesWindow = addSearch(m_modulesView, tr("Modules"), DOCKWIDGET_MODULES); m_registerView = new RegisterTreeView; + m_registerView->setSettings(settings, "Debugger.RegisterView"); m_registerWindow = addSearch(m_registerView, tr("Registers"), DOCKWIDGET_REGISTER); m_stackView = new StackTreeView; + m_stackView->setSettings(settings, "Debugger.StackView"); m_stackWindow = addSearch(m_stackView, tr("Stack"), DOCKWIDGET_STACK); m_sourceFilesView = new SourceFilesTreeView; + m_sourceFilesView->setSettings(settings, "Debugger.SourceFilesView"); m_sourceFilesWindow = addSearch(m_sourceFilesView, tr("Source Files"), DOCKWIDGET_SOURCE_FILES); m_threadsView = new ThreadsTreeView; + m_threadsView->setSettings(settings, "Debugger.ThreadsView"); m_threadsWindow = addSearch(m_threadsView, tr("Threads"), DOCKWIDGET_THREADS); - m_returnView = new WatchTreeView(ReturnType); + m_returnView = new WatchTreeView(ReturnType); // No settings. m_returnWindow = addSearch(m_returnView, tr("Locals and Expressions"), "CppDebugReturn"); m_localsView = new WatchTreeView(LocalsType); + m_localsView->setSettings(settings, "Debugger.LocalsView"); m_localsWindow = addSearch(m_localsView, tr("Locals and Expressions"), "CppDebugLocals"); - m_watchersView = new WatchTreeView(WatchersType); + m_watchersView = new WatchTreeView(WatchersType); // No settings. m_watchersWindow = addSearch(m_watchersView, tr("Locals and Expressions"), "CppDebugWatchers"); m_inspectorView = new WatchTreeView(InspectType); + m_inspectorView->setSettings(settings, "Debugger.LocalsView"); // sic! same as locals view. m_inspectorWindow = addSearch(m_inspectorView, tr("Locals and Expressions"), "Inspector"); // Snapshot m_snapshotHandler = new SnapshotHandler; m_snapshotView = new SnapshotTreeView(m_snapshotHandler); + m_snapshotView->setSettings(settings, "Debugger.SnapshotView"); m_snapshotView->setModel(m_snapshotHandler->model()); m_snapshotWindow = addSearch(m_snapshotView, tr("Snapshots"), DOCKWIDGET_SNAPSHOTS); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index cc1124552a..6aec7c9709 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -587,6 +587,8 @@ QWidget *CallgrindToolPrivate::createWidgets() { QTC_ASSERT(!m_visualisation, return 0); + QSettings *coreSettings = ICore::settings(); + // // DockWidgets // @@ -600,6 +602,7 @@ QWidget *CallgrindToolPrivate::createWidgets() m_callersView = new CostView(mw); m_callersView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CallersView")); + m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView"); m_callersView->sortByColumn(CallModel::CostColumn); m_callersView->setFrameStyle(QFrame::NoFrame); // enable sorting @@ -612,6 +615,7 @@ QWidget *CallgrindToolPrivate::createWidgets() m_calleesView = new CostView(mw); m_calleesView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CalleesView")); + m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView"); m_calleesView->sortByColumn(CallModel::CostColumn); m_calleesView->setFrameStyle(QFrame::NoFrame); // enable sorting @@ -624,6 +628,7 @@ QWidget *CallgrindToolPrivate::createWidgets() m_flatView = new CostView(mw); m_flatView->setObjectName(QLatin1String("Valgrind.CallgrindTool.FlatView")); + m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView"); m_flatView->sortByColumn(DataModel::SelfCostColumn); m_flatView->setFrameStyle(QFrame::NoFrame); m_flatView->setAttribute(Qt::WA_MacShowFocusRect, false); -- cgit v1.2.1