diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp index f2408548..8f66d10b 100644 --- a/src/common/Configuration.cpp +++ b/src/common/Configuration.cpp @@ -136,7 +136,7 @@ static const QHash asmOptions = { { "asm.esil", false }, { "asm.reloff.flags", false }, { "esil.breakoninvalid", true }, { "dbg.trace_continue", true }, - { "ag.offset", false } }; + { "asm.offset", true } }; Configuration::Configuration() : QObject(), nativePalette(qApp->palette()) { diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp index dd73daa1..bc2c4ed5 100644 --- a/src/dialogs/preferences/AsmOptionsWidget.cpp +++ b/src/dialogs/preferences/AsmOptionsWidget.cpp @@ -79,7 +79,7 @@ void AsmOptionsWidget::updateAsmOptionsFromVars() ui->cmtcolSpinBox->setEnabled(cmtRightEnabled); bool offsetsEnabled = - Config()->getConfigBool("asm.offset") || Config()->getConfigBool("ag.offset"); + Config()->getConfigBool("asm.offset") || Config()->getConfigBool("graph.offset"); ui->relOffsetLabel->setEnabled(offsetsEnabled); ui->relOffsetCheckBox->setEnabled(offsetsEnabled); ui->relOffFlagsCheckBox->setEnabled(Config()->getConfigBool("asm.offset") @@ -288,8 +288,8 @@ void AsmOptionsWidget::asmComboBoxChanged(int index) void AsmOptionsWidget::offsetCheckBoxToggled(bool checked) { - ui->relOffsetLabel->setEnabled(checked || Config()->getConfigBool("ag.offset")); - ui->relOffsetCheckBox->setEnabled(checked || Config()->getConfigBool("ag.offset")); + ui->relOffsetLabel->setEnabled(checked || Config()->getConfigBool("asm.offset")); + ui->relOffsetCheckBox->setEnabled(checked || Config()->getConfigBool("asm.offset")); ui->relOffFlagsCheckBox->setEnabled(checked && Config()->getConfigBool("asm.reloff")); } diff --git a/src/dialogs/preferences/GraphOptionsWidget.cpp b/src/dialogs/preferences/GraphOptionsWidget.cpp index 8f0331d3..5692efaa 100644 --- a/src/dialogs/preferences/GraphOptionsWidget.cpp +++ b/src/dialogs/preferences/GraphOptionsWidget.cpp @@ -42,7 +42,7 @@ GraphOptionsWidget::~GraphOptionsWidget() {} void GraphOptionsWidget::updateOptionsFromVars() { qhelpers::setCheckedWithoutSignals(ui->graphOffsetCheckBox, - Config()->getConfigBool("ag.offset")); + Config()->getConfigBool("asm.offset")); ui->maxColsSpinBox->blockSignals(true); ui->maxColsSpinBox->setValue(Config()->getGraphBlockMaxChars()); ui->maxColsSpinBox->blockSignals(false); @@ -80,7 +80,6 @@ void GraphOptionsWidget::on_minFontSizeSpinBox_valueChanged(int value) void GraphOptionsWidget::on_graphOffsetCheckBox_toggled(bool checked) { - Config()->setConfig("ag.offset", checked); Config()->setConfig("asm.offset", checked); Core()->triggerAsmOptionsChanged(); triggerOptionsChanged();