From a6a8d5a760d6ff5510ff7fa67ae3c0ba00a90981 Mon Sep 17 00:00:00 2001
From: Rune Tynan <runetynan@gmail.com>
Date: Sun, 9 Sep 2018 13:55:13 -0400
Subject: [PATCH] Add instruction preview to the bytes edit dialog (#696)

---
 src/dialogs/EditInstructionDialog.cpp | 19 +++++++++
 src/dialogs/EditInstructionDialog.h   |  2 +
 src/dialogs/EditInstructionDialog.ui  | 60 +++++++++++++++++++++++++--
 3 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/src/dialogs/EditInstructionDialog.cpp b/src/dialogs/EditInstructionDialog.cpp
index 67d61736..2fa22fe8 100644
--- a/src/dialogs/EditInstructionDialog.cpp
+++ b/src/dialogs/EditInstructionDialog.cpp
@@ -1,5 +1,6 @@
 #include "EditInstructionDialog.h"
 #include "ui_EditInstructionDialog.h"
+#include "Cutter.h"
 
 EditInstructionDialog::EditInstructionDialog(QWidget *parent) :
     QDialog(parent),
@@ -32,6 +33,16 @@ QString EditInstructionDialog::getInstruction()
 void EditInstructionDialog::setInstruction(const QString &instruction)
 {
     ui->lineEdit->setText(instruction);
+    updatePreview(instruction);
+}
+
+void EditInstructionDialog::updatePreview(const QString &hex) {
+    QString result = Core()->disassemble(hex).trimmed();
+    if (result.isEmpty() || result.contains("\n")) {
+        ui->instructionLabel->setText("Unknown Instruction");
+    } else {
+        ui->instructionLabel->setText(result);
+    }
 }
 
 bool EditInstructionDialog::eventFilter(QObject *obj, QEvent *event)
@@ -47,6 +58,14 @@ bool EditInstructionDialog::eventFilter(QObject *obj, QEvent *event)
             this->accept();
             return true;
         }
+        
+        // Update instruction preview
+        QString lineText = ui->lineEdit->text();
+        if (keyEvent -> key() == Qt::Key_Backspace) {
+            updatePreview(lineText.left(lineText.size() - 1));
+        } else {
+            updatePreview(lineText + keyEvent->text());
+        }
     }
 
 
diff --git a/src/dialogs/EditInstructionDialog.h b/src/dialogs/EditInstructionDialog.h
index 1c84967f..4115a007 100644
--- a/src/dialogs/EditInstructionDialog.h
+++ b/src/dialogs/EditInstructionDialog.h
@@ -19,6 +19,8 @@ public:
 
     QString getInstruction();
     void setInstruction(const QString &instruction);
+    
+    void updatePreview(const QString &hex);
 
 private slots:
     void on_buttonBox_accepted();
diff --git a/src/dialogs/EditInstructionDialog.ui b/src/dialogs/EditInstructionDialog.ui
index e1d9f848..99881dfe 100644
--- a/src/dialogs/EditInstructionDialog.ui
+++ b/src/dialogs/EditInstructionDialog.ui
@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Edit Instruction</string>
   </property>
+  <property name="sizeGripEnabled">
+   <bool>false</bool>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
     <number>2</number>
@@ -30,13 +33,62 @@
     <number>2</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="topMargin">
-      <number>0</number>
-     </property>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QLineEdit" name="lineEdit"/>
      </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="leftMargin">
+        <number>5</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="instructionLabel">
+         <property name="baseSize">
+          <size>
+           <width>1000</width>
+           <height>10</height>
+          </size>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Unknown Instruction</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_1">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
    <item>