Debugger: Merge GDB and GDB Extended option pages

Change-Id: I0d4c041cec9ea01e1310f08a4ee87ed8080976bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-12-20 11:17:36 +01:00
parent 44d2f15108
commit 2b97f69796
6 changed files with 30 additions and 68 deletions

View File

@@ -36,6 +36,12 @@ public:
using namespace Layouting;
DebuggerSettings &s = *debuggerSettings();
auto labelDangerous = new QLabel("<html><head/><body><i>" +
Tr::tr("The options below give access to advanced<br>"
"or experimental functions of GDB.<p>"
"Enabling them may negatively impact<br>"
"your debugging experience.") + "</i></body></html>");
Group general {
title(Tr::tr("General")),
Column {
@@ -49,53 +55,9 @@ public:
s.intelFlavor,
s.usePseudoTracepoints,
s.useIndexCache,
st
}
};
Column commands {
Group {
title(Tr::tr("Additional Startup Commands")),
Column { s.gdbStartupCommands }
},
Group {
title(Tr::tr("Additional Attach Commands")),
Column { s.gdbPostAttachCommands },
},
st
};
Row { general, commands }.attachTo(w);
});
}
};
/////////////////////////////////////////////////////////////////////////
//
// GdbOptionsPage2 - dangerous options
//
/////////////////////////////////////////////////////////////////////////
// The "Dangerous" options.
class GdbOptionsPage2 : public Core::IOptionsPage
{
public:
GdbOptionsPage2()
{
setId("M.Gdb2");
setDisplayName(Tr::tr("GDB Extended"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setSettings(&debuggerSettings()->page3);
setLayouter([](QWidget *w) {
auto labelDangerous = new QLabel("<html><head/><body><i>" +
Tr::tr("The options below give access to advanced "
"or experimental functions of GDB.<br>Enabling them may negatively "
"impact your debugging experience.") + "</i></body></html>");
using namespace Layouting;
DebuggerSettings &s = *debuggerSettings();
Group extended {
title(Tr::tr("Extended")),
Column {
@@ -107,10 +69,21 @@ public:
s.breakOnAbort,
s.enableReverseDebugging,
s.multiInferior,
st
}
};
Column { extended, st }.attachTo(w);
Group startup {
title(Tr::tr("Additional Startup Commands")),
Column { s.gdbStartupCommands }
};
Group attach {
title(Tr::tr("Additional Attach Commands")),
Column { s.gdbPostAttachCommands },
};
Grid { general, extended, br, startup, attach }.attachTo(w);
});
}
};
@@ -120,7 +93,6 @@ public:
void addGdbOptionPages(QList<IOptionsPage *> *opts)
{
opts->push_back(new GdbOptionsPage);
opts->push_back(new GdbOptionsPage2);
}
} // Debugger::Internal