Debugger: More column resizing

Turns out setting the column resize mode on the view itself
is counter-productive as it takes away the ability to
manually re-adjust.

So set the mode only temporarily to get the preferred width
than switch back to manually resize mode and use the hint
to set some initial size. Also use the length of the header
label as absolute minimum.

Change-Id: Ic17e31334b23ce6d541f9459cd22be65145046d3
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 4 insertions, 58 deletions

diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index b77fc2394a1..89901af73ea 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -106,69 +106,15 @@ DebuggerSettings::DebuggerSettings()
     // View
     //
     item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
+    item->setText(tr("Always Adjust View Column Widths to Contents"));
     item->setCheckable(true);
     item->setValue(true);
     item->setDefaultValue(true);
     item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustLocalsColumnWidths2"));
-    insertItem(AlwaysAdjustLocalsColumnWidths, item);
+        QLatin1String("AlwaysAdjustColumnWidths"));
+    insertItem(AlwaysAdjustColumnWidths, item);
 
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(true);
-    item->setDefaultValue(true);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustStackColumnWidths2"));
-    insertItem(AlwaysAdjustStackColumnWidths, item);
-
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(true);
-    item->setDefaultValue(true);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustThreadsColumnWidths2"));
-    insertItem(AlwaysAdjustThreadsColumnWidths, item);
-
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(false);
-    item->setDefaultValue(false);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustRegistersColumnWidths"));
-    insertItem(AlwaysAdjustRegistersColumnWidths, item);
-
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(false);
-    item->setDefaultValue(false);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustSnapshotsColumnWidths"));
-    insertItem(AlwaysAdjustSnapshotsColumnWidths, item);
-
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(false);
-    item->setDefaultValue(false);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustBreakpointsColumnWidths"));
-    insertItem(AlwaysAdjustBreakpointsColumnWidths, item);
-
-    item = new SavedAction(this);
-    item->setText(tr("Always Adjust Column Widths to Contents"));
-    item->setCheckable(true);
-    item->setValue(false);
-    item->setDefaultValue(false);
-    item->setSettingsKey(debugModeGroup,
-        QLatin1String("AlwaysAdjustModulesColumnWidths"));
-    insertItem(AlwaysAdjustModulesColumnWidths, item);
-
-    //Needed by QML Inspector
+    // Needed by QML Inspector
     item = new SavedAction(this);
     item->setText(tr("Use Alternating Row Colors"));
     item->setSettingsKey(debugModeGroup, QLatin1String("UseAlternatingRowColours"));