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

Debugger: Use an aspect for the source path mapping

Browse Source 
More in line with the other settings.

Change-Id: I86494f1955120cddda7d2f2eec8ba0fdbfd99585
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-03-05 12:48:26 +01:00
parent cb55af8e55
commit 641604429a
11 changed files with 197 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -27,31 +27,15 @@
#include "debuggeractions.h"
#include "debuggerinternalconstants.h"
#include "debuggercore.h"
#include "debuggersourcepathmappingwidget.h"
#include <coreplugin/icore.h>
#include <app/app_version.h>
#include <utils/hostosinfo.h>
#include <utils/layoutbuilder.h>
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <utils/variablechooser.h>
#include <QCoreApplication>
#include <QLabel>
#include <QTextStream>
using namespace Core;
using namespace Debugger::Constants;
using namespace ProjectExplorer;
using namespace Utils;
namespace Utils {
}
namespace Debugger {
namespace Internal {
@@ -68,12 +52,6 @@ class CommonOptionsPageWidget : public Core::IOptionsPageWidget
public:
explicit CommonOptionsPageWidget()
{
m_sourceMappingWidget = new DebuggerSourcePathMappingWidget(this);
GlobalDebuggerOptions *options = Internal::globalDebuggerOptions();
SourcePathMap allPathMap = options->sourcePathMap;
m_sourceMappingWidget->setSourcePathMap(allPathMap);
DebuggerSettings &s = *debuggerSettings();
using namespace Layouting;
@@ -100,29 +78,18 @@ public:
Column {
Group { Title("Behavior"), Row { col1, col2, Stretch() } },
m_sourceMappingWidget,
s.sourcePathMap,
Stretch()
}.attachTo(this);
}
void apply() final;
void apply() final { m_group.apply(); m_group.writeSettings(ICore::settings()); }
void finish() final { m_group.finish(); }
private:
AspectContainer &m_group = debuggerSettings()->page1;
DebuggerSourcePathMappingWidget *m_sourceMappingWidget = nullptr;
};
void CommonOptionsPageWidget::apply()
{
m_group.apply();
m_group.writeSettings(ICore::settings());
GlobalDebuggerOptions *options = Internal::globalDebuggerOptions();
options->sourcePathMap = m_sourceMappingWidget->sourcePathMap();
options->toSettings();
}
CommonOptionsPage::CommonOptionsPage()
{
setId(DEBUGGER_COMMON_SETTINGS_ID);