ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-07 15:32:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Change edit dialog to allow no preview (#869)

Browse Source 
* Change edit dialog to allow no preview

* AStyle fixes

* More style fixes, forgot some files
This commit is contained in:
Rune Tynan 2018-10-23 01:06:26 -04:00 committed by Itay Cohen
parent 528adf429a
commit 3400314cd2
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dialogs/EditInstructionDialog.cpp
View File

@ -2,10 +2,10 @@
#include "ui_EditInstructionDialog.h"
#include "Cutter.h"
EditInstructionDialog::EditInstructionDialog(QWidget *parent, bool isEditingBytes) :
EditInstructionDialog::EditInstructionDialog(QWidget *parent, InstructionEditMode editMode) :
QDialog(parent),
ui(new Ui::EditInstructionDialog),
isEditingBytes(isEditingBytes)
editMode(editMode)
{
ui->setupUi(this);
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
@ -40,9 +40,13 @@ void EditInstructionDialog::setInstruction(const QString &instruction)
void EditInstructionDialog::updatePreview(const QString &input)
{
QString result;
if (isEditingBytes) {
if (editMode == EDIT_NONE) {
ui->instructionLabel->setText("");
return;
} else if (editMode == EDIT_BYTES) {
result = Core()->disassemble(input).trimmed();
} else {
} else if (editMode == EDIT_TEXT) {
result = Core()->assemble(input).trimmed();
}

8
src/dialogs/EditInstructionDialog.h
View File

@ -9,12 +9,16 @@ namespace Ui {
class EditInstructionDialog;
}
enum InstructionEditMode {
EDIT_NONE, EDIT_BYTES, EDIT_TEXT
};
class EditInstructionDialog : public QDialog
{
Q_OBJECT
public:
explicit EditInstructionDialog(QWidget *parent, bool isEditingBytes);
explicit EditInstructionDialog(QWidget *parent, InstructionEditMode isEditingBytes);
~EditInstructionDialog();
QString getInstruction();
@ -29,7 +33,7 @@ private slots:
private:
std::unique_ptr<Ui::EditInstructionDialog> ui;
bool isEditingBytes; // true if editing intruction **bytes**; false if editing instruction **text**
InstructionEditMode editMode; // true if editing intruction **bytes**; false if editing instruction **text**
};
#endif // EDITINSTRUCTIONDIALOG_H

4
src/menus/DisassemblyContextMenu.cpp
View File

@ -375,7 +375,7 @@ QList<QKeySequence> DisassemblyContextMenu::getAddBPSequence() const
void DisassemblyContextMenu::on_actionEditInstruction_triggered()
{
EditInstructionDialog *e = new EditInstructionDialog(this, false);
EditInstructionDialog *e = new EditInstructionDialog(this, EDIT_TEXT);
e->setWindowTitle(tr("Edit Instruction at %1").arg(RAddressString(offset)));
QString oldInstructionOpcode = Core()->getInstructionOpcode(offset);
@ -440,7 +440,7 @@ void DisassemblyContextMenu::on_actionJmpReverse_triggered()
void DisassemblyContextMenu::on_actionEditBytes_triggered()
{
EditInstructionDialog *e = new EditInstructionDialog(this, true);
EditInstructionDialog *e = new EditInstructionDialog(this, EDIT_BYTES);
e->setWindowTitle(tr("Edit Bytes at %1").arg(RAddressString(offset)));
QString oldBytes = Core()->getInstructionBytes(offset);

3
src/widgets/StackWidget.cpp
View File

@ -123,8 +123,7 @@ void StackWidget::editStack()
bool ok;
int row = viewStack->selectionModel()->currentIndex().row();
QString offset = viewStack->selectionModel()->currentIndex().sibling(row, 0).data().toString();
// FIXME: This is not correct because there should be no preview of anything
EditInstructionDialog *e = new EditInstructionDialog(this, false);
EditInstructionDialog *e = new EditInstructionDialog(this, EDIT_NONE);
e->setWindowTitle(tr("Edit stack at %1").arg(offset));
QString oldBytes = viewStack->selectionModel()->currentIndex().sibling(row, 1).data().toString();