From 0c3743bb56d34619c723b1a13e974a451353d47e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 8 Jul 2011 15:33:13 +0200
Subject: [PATCH] debugger: use saved "resize columns to contents" settings
Change-Id: I88d50205d6ba626e0b4bf66879271fafab81e8cb
Reviewed-by: con
Task-number: QTCREATORBUG-5320
Reviewed-on: http://codereview.qt.nokia.com/1379
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/debugger/breakwindow.cpp | 4 ++++
src/plugins/debugger/debuggerplugin.cpp | 4 ++--
src/plugins/debugger/moduleswindow.cpp | 5 ++++-
src/plugins/debugger/registerwindow.cpp | 4 ++++
src/plugins/debugger/snapshotwindow.cpp | 10 ++++++++++
src/plugins/debugger/snapshotwindow.h | 1 +
src/plugins/debugger/stackwindow.cpp | 4 ++++
src/plugins/debugger/threadswindow.cpp | 4 ++++
8 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 22e82d812f6..02996bfa7bf 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -527,6 +527,10 @@ void BreakWindow::setModel(QAbstractItemModel *model)
resizeColumnToContents(0); // Number
resizeColumnToContents(3); // Line
resizeColumnToContents(6); // Ignore count
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustBreakpointsColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
connect(model, SIGNAL(layoutChanged()), this, SLOT(expandAll()));
}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 01f9051d7c8..b20222b597d 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2584,7 +2584,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
ICore *core = ICore::instance();
QTC_ASSERT(core, return);
m_coreSettings = core->settings();
+
m_debuggerSettings = new DebuggerSettings(m_coreSettings);
+ m_debuggerSettings->readSettings();
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(coreShutdown()));
@@ -2776,8 +2778,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
m_commonOptionsPage = new CommonOptionsPage(m_globalDebuggerOptions);
m_plugin->addAutoReleasedObject(m_commonOptionsPage);
- m_debuggerSettings->readSettings();
-
// Do not fail to load the whole plugin if something goes wrong here.
QString errorMessage;
if (!parseArguments(m_arguments, &m_cmdLineEnabledEngines, &errorMessage)) {
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index ee23318b789..390397f15d1 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -215,7 +215,10 @@ void ModulesWindow::setAlwaysResizeColumnsToContents(bool on)
void ModulesWindow::setModel(QAbstractItemModel *model)
{
QTreeView::setModel(model);
- setAlwaysResizeColumnsToContents(true);
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustModulesColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
}
} // namespace Internal
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 9407618adff..491f314bb3f 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -296,6 +296,10 @@ void RegisterWindow::setModel(QAbstractItemModel *model)
{
QTreeView::setModel(model);
setAlwaysResizeColumnsToContents(true);
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustRegistersColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
}
void RegisterWindow::reloadRegisters()
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index 92079f91e76..6f1429611d8 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -135,6 +135,16 @@ void SnapshotWindow::removeSnapshot(int i)
m_snapshotHandler->at(i)->quitDebugger();
}
+void SnapshotWindow::setModel(QAbstractItemModel *model)
+{
+ QTreeView::setModel(model);
+ setAlwaysResizeColumnsToContents(true);
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustSnapshotsColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
+}
+
void SnapshotWindow::resizeColumnsToContents()
{
for (int i = model()->columnCount(); --i >= 0; )
diff --git a/src/plugins/debugger/snapshotwindow.h b/src/plugins/debugger/snapshotwindow.h
index 3b6ce709c09..f9b2a399590 100644
--- a/src/plugins/debugger/snapshotwindow.h
+++ b/src/plugins/debugger/snapshotwindow.h
@@ -59,6 +59,7 @@ private:
void removeSnapshot(int i);
void keyPressEvent(QKeyEvent *ev);
void contextMenuEvent(QContextMenuEvent *ev);
+ void setModel(QAbstractItemModel *model);
SnapshotHandler *m_snapshotHandler;
};
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 92e0722e7ac..ef51bf71e51 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -105,6 +105,10 @@ void StackWindow::setModel(QAbstractItemModel *model)
//resizeColumnsToContents();
resizeColumnToContents(0);
resizeColumnToContents(3);
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustStackColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
}
void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 5d70e5a71d4..5d1c1de729e 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -82,6 +82,10 @@ void ThreadsWindow::setModel(QAbstractItemModel *model)
resizeColumnToContents(0); // Id
resizeColumnToContents(4); // Line
resizeColumnToContents(6); // Name
+ if (header()) {
+ bool adjust = debuggerCore()->boolSetting(AlwaysAdjustThreadsColumnWidths);
+ setAlwaysResizeColumnsToContents(adjust);
+ }
}
void ThreadsWindow::contextMenuEvent(QContextMenuEvent *ev)
--
GitLab