From 45e7b78dc3a25c42f19d4275e7b678cfbd4c5771 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 31 Mar 2020 11:37:49 +0200 Subject: [PATCH] Debugger: Add action to reset individual/type formats Task-number: QTCREATORBUG-22922 Change-Id: Ic8d0dd1214c208869bebdd69feb2cca1213d30cd Reviewed-by: hjk Reviewed-by: Leena Miettinen --- src/plugins/debugger/watchhandler.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 9aac88f9e37..beab34f8f3b 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1910,12 +1910,18 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) }); } + addAction(menu, tr("Reset All Individual Formats"), true, [this]() { + theIndividualFormats.clear(); + saveFormats(); + m_engine->updateLocals(); + }); + menu->addSeparator(); addAction(menu, tr("Change Display for Type \"%1\":").arg(item->type), false); addCheckableAction(menu, spacer + tr("Automatic"), true, typeFormat == AutomaticFormat, [this, item] { - //const QModelIndexList active = activeRows(); + //const QModelIndexList active = activeRows(); //for (const QModelIndex &idx : active) // setModelData(LocalsTypeFormatRole, AutomaticFormat, idx); setTypeFormat(item->type, AutomaticFormat); @@ -1925,11 +1931,17 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) for (int format : alternativeFormats) { addCheckableAction(menu, spacer + nameForFormat(format), true, format == typeFormat, [this, format, item] { - setTypeFormat(item->type, format); - m_engine->updateLocals(); + setTypeFormat(item->type, format); + m_engine->updateLocals(); }); } + addAction(menu, tr("Reset All Formats for Types"), true, [this]() { + theTypeFormats.clear(); + saveFormats(); + m_engine->updateLocals(); + }); + return menu; }