ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-19 11:26:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset Settings for asm options (Fix #123)

Browse Source
This commit is contained in:
Florian Märkl 2017-12-03 13:48:51 +01:00
parent 7d9cfca2d8
commit fde759b6ae
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/dialogs/AsmOptionsDialog.cpp
View File

@ -21,19 +21,26 @@ AsmOptionsDialog::AsmOptionsDialog(QWidget *parent)
ui->syntaxComboBox->addItem(syntax, syntax); ui->syntaxComboBox->addItem(syntax, syntax);
ui->syntaxComboBox->blockSignals(false); ui->syntaxComboBox->blockSignals(false);
QFont currentFont = Config()->getFont();
ui->fontSelectionLabel->setText(currentFont.toString());
// asm.offset=false would break reading the offset in DisassemblyWidget // asm.offset=false would break reading the offset in DisassemblyWidget
// TODO: remove this when DisassemblyWidget::readDisassemblyOffset() allows it // TODO: remove this when DisassemblyWidget::readDisassemblyOffset() allows it
ui->offsetCheckBox->setVisible(false); ui->offsetCheckBox->setVisible(false);
updateFromVars(); updateAsmOptionsFromVars();
updateFontFromConfig();
connect(core, SIGNAL(asmOptionsChanged()), this, SLOT(updateAsmOptionsFromVars()));
connect(Config(), SIGNAL(fontsUpdated()), this, SLOT(updateFontFromConfig()));
} }
AsmOptionsDialog::~AsmOptionsDialog() {} AsmOptionsDialog::~AsmOptionsDialog() {}
void AsmOptionsDialog::updateFromVars() void AsmOptionsDialog::updateFontFromConfig()
{
QFont currentFont = Config()->getFont();
ui->fontSelectionLabel->setText(currentFont.toString());
}
void AsmOptionsDialog::updateAsmOptionsFromVars()
{ {
qhelpers::setCheckedWithoutSignals(ui->esilCheckBox, core->getConfigb("asm.esil")); qhelpers::setCheckedWithoutSignals(ui->esilCheckBox, core->getConfigb("asm.esil"));
qhelpers::setCheckedWithoutSignals(ui->pseudoCheckBox, core->getConfigb("asm.pseudo")); qhelpers::setCheckedWithoutSignals(ui->pseudoCheckBox, core->getConfigb("asm.pseudo"));
@ -92,39 +99,46 @@ void AsmOptionsDialog::saveAsDefault()
void AsmOptionsDialog::resetToDefault() void AsmOptionsDialog::resetToDefault()
{ {
core->resetDefaultAsmOptions(); core->resetDefaultAsmOptions();
updateFromVars(); updateAsmOptionsFromVars();
triggerAsmOptionsChanged();
}
void AsmOptionsDialog::triggerAsmOptionsChanged()
{
disconnect(core, SIGNAL(asmOptionsChanged()), this, SLOT(updateAsmOptionsFromVars()));
core->triggerAsmOptionsChanged(); core->triggerAsmOptionsChanged();
connect(core, SIGNAL(asmOptionsChanged()), this, SLOT(updateAsmOptionsFromVars()));
} }
void AsmOptionsDialog::on_esilCheckBox_toggled(bool checked) void AsmOptionsDialog::on_esilCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.esil", checked); core->setConfig("asm.esil", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_pseudoCheckBox_toggled(bool checked) void AsmOptionsDialog::on_pseudoCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.pseudo", checked); core->setConfig("asm.pseudo", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_offsetCheckBox_toggled(bool checked) void AsmOptionsDialog::on_offsetCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.offset", checked); core->setConfig("asm.offset", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_describeCheckBox_toggled(bool checked) void AsmOptionsDialog::on_describeCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.describe", checked); core->setConfig("asm.describe", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_stackpointerCheckBox_toggled(bool checked) void AsmOptionsDialog::on_stackpointerCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.stackptr", checked); core->setConfig("asm.stackptr", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_bytesCheckBox_toggled(bool checked) void AsmOptionsDialog::on_bytesCheckBox_toggled(bool checked)
@ -132,25 +146,25 @@ void AsmOptionsDialog::on_bytesCheckBox_toggled(bool checked)
core->setConfig("asm.bytes", checked); core->setConfig("asm.bytes", checked);
ui->bytespaceCheckBox->setEnabled(checked); ui->bytespaceCheckBox->setEnabled(checked);
ui->lbytesCheckBox->setEnabled(checked); ui->lbytesCheckBox->setEnabled(checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_bytespaceCheckBox_toggled(bool checked) void AsmOptionsDialog::on_bytespaceCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.bytespace", checked); core->setConfig("asm.bytespace", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_lbytesCheckBox_toggled(bool checked) void AsmOptionsDialog::on_lbytesCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.lbytes", checked); core->setConfig("asm.lbytes", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_syntaxComboBox_currentIndexChanged(int index) void AsmOptionsDialog::on_syntaxComboBox_currentIndexChanged(int index)
{ {
core->setConfig("asm.syntax", ui->syntaxComboBox->itemData(index).toString().toUtf8().constData()); core->setConfig("asm.syntax", ui->syntaxComboBox->itemData(index).toString().toUtf8().constData());
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_caseComboBox_currentIndexChanged(int index) void AsmOptionsDialog::on_caseComboBox_currentIndexChanged(int index)
@ -182,26 +196,26 @@ void AsmOptionsDialog::on_caseComboBox_currentIndexChanged(int index)
core->setConfig("asm.ucase", ucase); core->setConfig("asm.ucase", ucase);
core->setConfig("asm.capitalize", capitalize); core->setConfig("asm.capitalize", capitalize);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_bblineCheckBox_toggled(bool checked) void AsmOptionsDialog::on_bblineCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.bbline", checked); core->setConfig("asm.bbline", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_varsubCheckBox_toggled(bool checked) void AsmOptionsDialog::on_varsubCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.varsub", checked); core->setConfig("asm.varsub", checked);
ui->varsubOnlyCheckBox->setEnabled(checked); ui->varsubOnlyCheckBox->setEnabled(checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_varsubOnlyCheckBox_toggled(bool checked) void AsmOptionsDialog::on_varsubOnlyCheckBox_toggled(bool checked)
{ {
core->setConfig("asm.varsub_only", checked); core->setConfig("asm.varsub_only", checked);
core->triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsDialog::on_buttonBox_clicked(QAbstractButton *button) void AsmOptionsDialog::on_buttonBox_clicked(QAbstractButton *button)
@ -226,6 +240,5 @@ void AsmOptionsDialog::on_fontSelectionButton_clicked()
QFont newFont = QFontDialog::getFont(&ok, currentFont, this); QFont newFont = QFontDialog::getFont(&ok, currentFont, this);
if (ok) { if (ok) {
Config()->setFont(newFont); Config()->setFont(newFont);
ui->fontSelectionLabel->setText(newFont.toString());
} }
} }

6
src/dialogs/AsmOptionsDialog.h
View File

@ -25,11 +25,15 @@ private:
CutterCore *core; CutterCore *core;
std::unique_ptr<Ui::AsmOptionsDialog> ui; std::unique_ptr<Ui::AsmOptionsDialog> ui;
void updateFromVars();
void saveAsDefault(); void saveAsDefault();
void resetToDefault(); void resetToDefault();
void triggerAsmOptionsChanged();
private slots: private slots:
void updateFontFromConfig();
void updateAsmOptionsFromVars();
void on_esilCheckBox_toggled(bool checked); void on_esilCheckBox_toggled(bool checked);
void on_pseudoCheckBox_toggled(bool checked); void on_pseudoCheckBox_toggled(bool checked);
void on_offsetCheckBox_toggled(bool checked); void on_offsetCheckBox_toggled(bool checked);

5
src/utils/Configuration.cpp
View File

@ -24,8 +24,13 @@ void Configuration::loadInitial()
void Configuration::resetAll() void Configuration::resetAll()
{ {
s.clear(); s.clear();
Core()->cmd("e-");
Core()->setSettings();
Core()->resetDefaultAsmOptions();
loadInitial(); loadInitial();
emit fontsUpdated(); emit fontsUpdated();
Core()->triggerAsmOptionsChanged();
} }
void Configuration::loadDefaultTheme() void Configuration::loadDefaultTheme()