Fixed Deobfuscation icon on script toolbar did not match the deobfuscation status

This commit is contained in:
Jindra Petřík
2023-01-22 22:15:04 +01:00
parent 125e8d29cd
commit 671ebf08a3
3 changed files with 15 additions and 1 deletions
+1
View File
@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
- [#1842] AS1/2 Better handling obfuscated code, for..in - [#1842] AS1/2 Better handling obfuscated code, for..in
- [#1842] AS1/2 use parenthesis when initObject has nonstring keys - [#1842] AS1/2 use parenthesis when initObject has nonstring keys
- [#1842] AS - Do not display §§dup when the value has no sideeffect - [#1842] AS - Do not display §§dup when the value has no sideeffect
- Deobfuscation icon on script toolbar did not match the deobfuscation status
## [18.3.2] - 2023-01-10 ## [18.3.2] - 2023-01-10
### Removed ### Removed
@@ -45,6 +45,7 @@ import com.jpexs.decompiler.flash.action.parser.script.ActionScriptLexer;
import com.jpexs.decompiler.flash.action.parser.script.ParsedSymbol; import com.jpexs.decompiler.flash.action.parser.script.ParsedSymbol;
import com.jpexs.decompiler.flash.action.parser.script.SymbolType; import com.jpexs.decompiler.flash.action.parser.script.SymbolType;
import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.configuration.ConfigurationItemChangeListener;
import com.jpexs.decompiler.flash.configuration.CustomConfigurationKeys; import com.jpexs.decompiler.flash.configuration.CustomConfigurationKeys;
import com.jpexs.decompiler.flash.configuration.SwfSpecificCustomConfiguration; import com.jpexs.decompiler.flash.configuration.SwfSpecificCustomConfiguration;
import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.EcmaScript;
@@ -971,7 +972,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
deobfuscateButton.addActionListener(this::deobfuscateButtonActionPerformed); deobfuscateButton.addActionListener(this::deobfuscateButtonActionPerformed);
deobfuscateButton.setToolTipText(AppStrings.translate("button.deobfuscate")); deobfuscateButton.setToolTipText(AppStrings.translate("button.deobfuscate"));
deobfuscateButton.setSelected(Configuration.autoDeobfuscate.get()); deobfuscateButton.setSelected(Configuration.autoDeobfuscate.get());
Configuration.autoDeobfuscate.addListener(new ConfigurationItemChangeListener<Boolean>(){
@Override
public void configurationItemChanged(Boolean newValue) {
deobfuscateButton.setSelected(newValue);
}
});
JButton deobfuscateOptionsButton = new JButton(View.getIcon("deobfuscateoptions16")); JButton deobfuscateOptionsButton = new JButton(View.getIcon("deobfuscateoptions16"));
deobfuscateOptionsButton.addActionListener(this::deobfuscateOptionsButtonActionPerformed); deobfuscateOptionsButton.addActionListener(this::deobfuscateOptionsButtonActionPerformed);
@@ -33,6 +33,7 @@ import com.jpexs.decompiler.flash.action.parser.script.SymbolType;
import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionPush;
import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; import com.jpexs.decompiler.flash.action.swf4.ConstantIndex;
import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.configuration.ConfigurationItemChangeListener;
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
import com.jpexs.decompiler.flash.gui.AppStrings; import com.jpexs.decompiler.flash.gui.AppStrings;
import com.jpexs.decompiler.flash.gui.DebugPanel; import com.jpexs.decompiler.flash.gui.DebugPanel;
@@ -811,6 +812,12 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
deobfuscateButton.addActionListener(this::deobfuscateButtonActionPerformed); deobfuscateButton.addActionListener(this::deobfuscateButtonActionPerformed);
deobfuscateButton.setToolTipText(AppStrings.translate("button.deobfuscate")); deobfuscateButton.setToolTipText(AppStrings.translate("button.deobfuscate"));
deobfuscateButton.setSelected(Configuration.autoDeobfuscate.get()); deobfuscateButton.setSelected(Configuration.autoDeobfuscate.get());
Configuration.autoDeobfuscate.addListener(new ConfigurationItemChangeListener<Boolean>(){
@Override
public void configurationItemChanged(Boolean newValue) {
deobfuscateButton.setSelected(newValue);
}
});
JButton deobfuscateOptionsButton = new JButton(View.getIcon("deobfuscateoptions16")); JButton deobfuscateOptionsButton = new JButton(View.getIcon("deobfuscateoptions16"));