feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use new IOptionsPage apply convenience

Browse Source 
Change-Id: I2954bec762fb3f5d3426663108ff493f140f1b5e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-03-25 15:45:58 +01:00
parent 1dba079cbd
commit c38739df57
1 changed files with 61 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/plugins/debugger/gdb/gdboptionspage.cpp
View File

@@ -29,7 +29,6 @@
#include <debugger/debuggerconstants.h> #include <debugger/debuggerconstants.h>
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <coreplugin/icore.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -41,7 +40,7 @@ namespace Internal {
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// GdbOptionsPageWidget - harmless options // GdbOptionsPage - harmless options
// //
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
@@ -50,100 +49,48 @@ class GdbOptionsPage : public Core::IOptionsPage
Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::GdbOptionsPage) Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::GdbOptionsPage)
public: public:
GdbOptionsPage(); GdbOptionsPage()
{
setId("M.Gdb");
setDisplayName(tr("GDB"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setSettings(&debuggerSettings()->page2);
setLayouter([](QWidget *w) {
using namespace Layouting;
DebuggerSettings &s = *debuggerSettings();
Group general {
Title { tr("General") },
Row { s.gdbWatchdogTimeout, Stretch() },
s.skipKnownFrames,
s.useMessageBoxForSignals,
s.adjustBreakpointLocations,
s.useDynamicType,
s.loadGdbInit,
s.loadGdbDumpers,
s.intelFlavor,
s.usePseudoTracepoints,
Stretch()
};
Column commands {
Group { Title { tr("Additional Startup Commands") }, s.gdbStartupCommands },
Group { Title { tr("Additional Attach Commands") }, s.gdbPostAttachCommands },
Stretch()
};
Row { general, commands }.attachTo(w);
});
}
}; };
class GdbOptionsPageWidget : public IOptionsPageWidget
{
Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::GdbOptionsPage)
public:
GdbOptionsPageWidget();
void apply() final { group.apply(); group.writeSettings(ICore::settings()); }
void finish() final { group.finish(); }
AspectContainer &group = debuggerSettings()->page2;
};
GdbOptionsPageWidget::GdbOptionsPageWidget()
{
using namespace Layouting;
DebuggerSettings &s = *debuggerSettings();
Group general {
Title { tr("General") },
Row { s.gdbWatchdogTimeout, Stretch() },
s.skipKnownFrames,
s.useMessageBoxForSignals,
s.adjustBreakpointLocations,
s.useDynamicType,
s.loadGdbInit,
s.loadGdbDumpers,
s.intelFlavor,
s.usePseudoTracepoints,
Stretch()
};
Column commands {
Group { Title { tr("Additional Startup Commands") }, s.gdbStartupCommands },
Group { Title { tr("Additional Attach Commands") }, s.gdbPostAttachCommands },
Stretch()
};
Row { general, commands }.attachTo(this);
}
GdbOptionsPage::GdbOptionsPage()
{
setId("M.Gdb");
setDisplayName(tr("GDB"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setWidgetCreator([] { return new GdbOptionsPageWidget; });
}
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// GdbOptionsPageWidget2 - dangerous options // GdbOptionsPage2 - dangerous options
// //
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
class GdbOptionsPageWidget2 : public IOptionsPageWidget
{
public:
GdbOptionsPageWidget2();
void apply() final { group.apply(); group.writeSettings(ICore::settings()); }
void finish() final { group.finish(); }
AspectContainer &group = debuggerSettings()->page3;
};
GdbOptionsPageWidget2::GdbOptionsPageWidget2()
{
auto labelDangerous = new QLabel("<html><head/><body><i>" +
GdbOptionsPage::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(GdbOptionsPage::tr("Extended")),
labelDangerous,
s.targetAsync,
s.autoEnrichParameters,
s.breakOnWarning,
s.breakOnFatal,
s.breakOnAbort,
s.enableReverseDebugging,
s.multiInferior,
};
Column { extended, Stretch() }.attachTo(this);
}
// The "Dangerous" options. // The "Dangerous" options.
class GdbOptionsPage2 : public Core::IOptionsPage class GdbOptionsPage2 : public Core::IOptionsPage
{ {
@@ -153,7 +100,31 @@ public:
setId("M.Gdb2"); setId("M.Gdb2");
setDisplayName(GdbOptionsPage::tr("GDB Extended")); setDisplayName(GdbOptionsPage::tr("GDB Extended"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setWidgetCreator([] { return new GdbOptionsPageWidget2; }); setSettings(&debuggerSettings()->page3);
setLayouter([](QWidget *w) {
auto labelDangerous = new QLabel("<html><head/><body><i>" +
GdbOptionsPage::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(GdbOptionsPage::tr("Extended")),
labelDangerous,
s.targetAsync,
s.autoEnrichParameters,
s.breakOnWarning,
s.breakOnFatal,
s.breakOnAbort,
s.enableReverseDebugging,
s.multiInferior,
};
Column { extended, Stretch() }.attachTo(w);
});
} }
}; };