Merge origin/master

libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java

@@ -330,7 +330,7 @@ public final class MethodBody implements Cloneable {
         b.getCode().markMappedOffsets();
 
         if (Configuration.autoDeobfuscate.get()) {
-            if (Configuration.deobfuscationMode.get() == 0) {
+            if (Configuration.deobfuscationOldMode.get()) {
                 try {
                     b.getCode().removeTraps(constants, trait, method_info.get(this.method_info), b, abc, scriptIndex, classIndex, isStatic, path);
                 } catch (Throwable ex) {

libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java

@@ -92,7 +92,7 @@ public class ActionListReader {
      */
     public static ActionList readActionListTimeout(final List<DisassemblyListener> listeners, final SWFInputStream sis, final int version, final int ip, final int endIp, final String path) throws IOException, InterruptedException, TimeoutException {
         try {
-            final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? Configuration.deobfuscationMode.get() : -1;
+            final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? (Configuration.deobfuscationOldMode.get() ? 0 : 1) : -1;
             ActionList actions = CancellableWorker.call(new Callable<ActionList>() {
 
                 @Override

libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java

@@ -90,9 +90,9 @@ public class Configuration {
     @ConfigurationCategory("script")
     public static final ConfigurationItem<Boolean> autoDeobfuscate = null;
 
-    @ConfigurationDefaultInt(1)
+    @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("")
-    public static final ConfigurationItem<Integer> deobfuscationMode = null;
+    public static final ConfigurationItem<Boolean> deobfuscationOldMode = null;
 
     @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("")

src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java

@@ -608,11 +608,10 @@ public abstract class MainFrameMenu implements MenuBuilder {
         }
     }
 
-    protected void deobfuscationMode(ActionEvent evt, int mode) {
-        Configuration.deobfuscationMode.set(mode);
-        mainFrame.getPanel().autoDeobfuscateChanged();
-    }
-
+    /*protected void deobfuscationMode(ActionEvent evt, int mode) {
+     Configuration.deobfuscationMode.set(mode);
+     mainFrame.getPanel().autoDeobfuscateChanged();
+     }*/
     protected void exitActionPerformed(ActionEvent evt) {
         JFrame frame = (JFrame) mainFrame;
         frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));

src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties

@@ -362,3 +362,6 @@ config.description.swfSpecificConfigs = Contains the SWF specific configurations
 
 config.name.exeExportMode = EXE export mode
 config.description.exeExportMode = EXE export mode
+
+config.name.deobfuscationOldMode = Switch deobfuscation to old (5.x) mode
+config.description.deobfuscationOldMode = Disable new deobfuscation and use the old one from previous versions. NOT RECOMMENDED.

src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_sv.properties

@@ -82,3 +82,12 @@ zoom.invalid = Ogiltigt zoomv\u00e4rde.
 
 symbolclass = Symbol Klass 
 symbolclass.csv = CSV
+
+sprites = Sprites
+sprites.png = PNG
+sprites.gif = GIF
+sprites.avi = AVI
+sprites.svg = SVG
+sprites.canvas = HTML5 Canvas
+sprites.pdf = PDF
+sprites.bmp = BMP

src/com/jpexs/decompiler/flash/gui/locales/MainFrame_sv.properties

@@ -614,3 +614,6 @@ header.warning.minimumLzmaVersion = LZMA kompression beh\u00f6ver SWF version 13
 
 filter.dmg = Mac K\u00f6rbara filer (*.dmg)
 filter.linuxExe = Linux K\u00f6rbara filer
+
+import.script.result = %count% skript har blivit importerade.
+import.script.as12warning = Importera skript kan bara importera AS1/2 skript