From 2e41a0ef62fcecc78c1423365e6eb22e6e8826b8 Mon Sep 17 00:00:00 2001
From: "honfika@gmail.com" <honfika@gmail.com>
Date: Sun, 29 May 2016 14:25:04 +0200
Subject: [PATCH] #1241 Settings to show original bytes

---
 .../jpexs/decompiler/flash/action/Action.java |  22 ++++++++++--------
 .../flash/configuration/Configuration.java    |   5 ++++
 .../flash/gui/action/ActionPanel.java         |  17 ++++++++++++++
 .../flash/gui/graphics/originalbytes16.png    | Bin 0 -> 554 bytes
 .../flash/gui/locales/MainFrame.properties    |   4 +++-
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
index b80825158..2310be52c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
@@ -540,17 +540,19 @@ public abstract class Action implements GraphSourceItem {
                 writer.appendNoHilight("; ");
                 byte[] bytes = a.getBytes(version);
                 writer.appendNoHilight(Helper.bytesToHexString(bytes));
-                long fileOffset = a.getFileOffset();
-                if (fileData != null && fileOffset != -1 && fileData.length > fileOffset + bytes.length - 1) {
-                    writer.appendNoHilight(" (");
-                    for (int i = 0; i < bytes.length; i++) {
-                        writer.appendNoHilight(Helper.byteToHex(fileData[(int) (fileOffset + i)]));
-                        writer.appendNoHilight(" ");
-                    }
+                if (Configuration.showOriginalBytesInPcodeHex.get()) {
+                    long fileOffset = a.getFileOffset();
+                    if (fileData != null && fileOffset != -1 && fileData.length > fileOffset + bytes.length - 1) {
+                        writer.appendNoHilight(" (");
+                        for (int i = 0; i < bytes.length; i++) {
+                            writer.appendNoHilight(Helper.byteToHex(fileData[(int) (fileOffset + i)]));
+                            writer.appendNoHilight(" ");
+                        }
 
-                    writer.appendNoHilight("@");
-                    writer.appendNoHilight(Helper.formatHex(a.getFileOffset(), 8));
-                    writer.appendNoHilight(")");
+                        writer.appendNoHilight("@");
+                        writer.appendNoHilight(Helper.formatHex(fileOffset, 8));
+                        writer.appendNoHilight(")");
+                    }
                 }
 
                 writer.newLine();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index fc5f1877a..71afa4a19 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -175,6 +175,11 @@ public class Configuration {
     @ConfigurationCategory("script")
     public static final ConfigurationItem<Boolean> resolveConstants = null;
 
+    @ConfigurationDefaultBoolean(false)
+    @ConfigurationCategory("script")
+    @ConfigurationInternal
+    public static final ConfigurationItem<Boolean> showOriginalBytesInPcodeHex = null;
+
     /**
      * Limit of code subs (for obfuscated code)
      */
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 549216d82..e3a30d09f 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -131,6 +131,8 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
 
     public JToggleButton resolveConstantsButton;
 
+    public JToggleButton showOriginalBytesInPcodeHexButton;
+
     public JLabel asmLabel = new HeaderLabel(AppStrings.translate("panel.disassembled"));
 
     public JLabel decLabel = new HeaderLabel(AppStrings.translate("panel.decompiled"));
@@ -637,6 +639,12 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         resolveConstantsButton.setMargin(new Insets(3, 3, 3, 3));
         resolveConstantsButton.setSelected(Configuration.resolveConstants.get());
 
+        showOriginalBytesInPcodeHexButton = new JToggleButton(View.getIcon("originalbytes16"));
+        showOriginalBytesInPcodeHexButton.addActionListener(this::showOriginalBytesInPcodeHexButtonActionPerformed);
+        showOriginalBytesInPcodeHexButton.setToolTipText(AppStrings.translate("button.showOriginalBytesInPcodeHex"));
+        showOriginalBytesInPcodeHexButton.setMargin(new Insets(3, 3, 3, 3));
+        showOriginalBytesInPcodeHexButton.setSelected(Configuration.showOriginalBytesInPcodeHex.get());
+
         topButtonsPan = new JPanel();
         topButtonsPan.setLayout(new BoxLayout(topButtonsPan, BoxLayout.X_AXIS));
         topButtonsPan.add(graphButton);
@@ -646,6 +654,7 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         topButtonsPan.add(constantsViewButton);
         topButtonsPan.add(Box.createRigidArea(new Dimension(10, 0)));
         topButtonsPan.add(resolveConstantsButton);
+        topButtonsPan.add(showOriginalBytesInPcodeHexButton);
 
         JPanel panCode = new JPanel(new BorderLayout());
         panCode.add(new JScrollPane(editor), BorderLayout.CENTER);
@@ -923,6 +932,14 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         setHex(getExportMode(), src.getScriptName());
     }
 
+    private void showOriginalBytesInPcodeHexButtonActionPerformed(ActionEvent evt) {
+        boolean resolve = showOriginalBytesInPcodeHexButton.isSelected();
+        Configuration.showOriginalBytesInPcodeHex.set(resolve);
+
+        srcWithHex = null;
+        setHex(getExportMode(), src.getScriptName());
+    }
+
     private void cancelActionButtonActionPerformed(ActionEvent evt) {
         setEditMode(false);
         setHex(getExportMode(), src.getScriptName());
diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png b/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png
new file mode 100644
index 0000000000000000000000000000000000000000..5deb5c2bfafeff097a591b866aed3ed46107c9b6
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vty3GZCw6i}nBj0k=s+
zK~y-)m6Jb6TTv9ofA4Coq9C>%0@X#qNm?PnI(5kN`Hz+g4i0WYE>s+)T8wBY<@uye
zg$~Iqbm&kis3nQeZh}D(9i@X7oJs`+`ye?E>5EVEQth`K&cBcE+;a~AT5I7iwASMH
z{dl&-N?Fh=u4Fx!3y9@VMqC|KthJV8GHH~WZDeUA#iz{}c^lV&edThLp5wU!@E3c&
zN7}!L#D^xy9maUv+RTI%y7STub#}Jb4VpG_6*Q|~!TKvAZ&%(CYK*b>^N0_bV>S<d
z5q&hMsuXXyCBl}2^cCMAJoX-0+aH!*2T{EVvI7oc&6D{DK`uQ-gmb<FIe$V)4bj)5
zLvR=K1{JxlbBqBTo<e<N9w~t0|8Q_UpbQ0PCsnjG6a#$;zTHUkhpfH)8N+3xx-41C
zQ_DfpQy7){)AMMc3HV(ixc{Jro&{IB+o7v9hDb^>(|!^WFpNuEjH!Hq*^S-R!jrap
zjQ51-c-YMGNs5^llk_ioUsozvZ^sF~m^Rx{8#n$D+4+$Y(=P7(s)FmyBA&!jq2;hu
s5Xepwx!kz~T&Fiq@X3bD8-f*F0Bfwdz|%wR4FCWD07*qoM6N<$f-$J?xc~qF

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
index 664df88d2..0875f7dc7 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -712,8 +712,10 @@ menu.settings.simplifyExpressions = Simplify expressions
 
 #after 8.0.1
 menu.recentFiles.empty = Recent file list is empty
-message.warning.outOfMemory32BitJre = OutOfMemory error occured. You are running 32bit Java on 64bit system. Please use 64bit Java.
+message.warning.outOfMemory32BitJre = OutOfMemory error occurred. You are running 32bit Java on 64bit system. Please use 64bit Java.
 
 menu.file.reloadAll = Reload all
 message.confirm.reloadAll = This action cancels all unsaved changes in all SWF files and reloads whole application again.\nDo you want to continue?
 export.script.singleFilePallelModeWarning = Single file script export is not supported with enabled parallel speedup
+
+button.showOriginalBytesInPcodeHex = Show original bytes