LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 09:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added: #2370 Magnet icon toggle for snap options.

Browse Source 
Better popups for deobfuscate options + link options.
This commit is contained in:
Jindra Petřík
2025-05-05 12:30:15 +02:00
parent 3bfe8ec768
commit 87b962ea12
14 changed files with 305 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+27 -23
View File
@@ -57,6 +57,7 @@ import com.jpexs.decompiler.flash.gui.FasterScrollPane;
import com.jpexs.decompiler.flash.gui.HeaderLabel;
import com.jpexs.decompiler.flash.gui.Main;
import com.jpexs.decompiler.flash.gui.MainPanel;
import com.jpexs.decompiler.flash.gui.PopupButton;
import com.jpexs.decompiler.flash.gui.SearchListener;
import com.jpexs.decompiler.flash.gui.SearchPanel;
import com.jpexs.decompiler.flash.gui.TagEditorPanel;
@@ -978,8 +979,23 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
}
});
JButton deobfuscateOptionsButton = new JButton(View.getIcon("deobfuscateoptions16"));
deobfuscateOptionsButton.addActionListener(this::deobfuscateOptionsButtonActionPerformed);
PopupButton deobfuscateOptionsButton = new PopupButton(View.getIcon("deobfuscateoptions16")) {
@Override
protected JPopupMenu getPopupMenu() {
JPopupMenu popupMenu = new JPopupMenu();
JCheckBoxMenuItem simplifyExpressionsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.simplify_expressions"));
simplifyExpressionsMenuItem.setSelected(Configuration.simplifyExpressions.get());
simplifyExpressionsMenuItem.addActionListener(ABCPanel.this::simplifyExpressionsMenuItemActionPerformed);
/*JCheckBoxMenuItem removeObfuscatedDeclarationsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.remove_obfuscated_declarations"));
removeObfuscatedDeclarationsMenuItem.setSelected(Configuration.deobfuscateAs12RemoveInvalidNamesAssignments.get());
removeObfuscatedDeclarationsMenuItem.addActionListener(this::removeObfuscatedDeclarationsMenuItemActionPerformed);
*/
popupMenu.add(simplifyExpressionsMenuItem);
//popupMenu.add(removeObfuscatedDeclarationsMenuItem);
return popupMenu;
}
};
deobfuscateOptionsButton.setToolTipText(AppStrings.translate("button.deobfuscate_options"));
deobfuscateOptionsButton.setMargin(new Insets(0, 0, 0, 0));
deobfuscateOptionsButton.setPreferredSize(new Dimension(30, deobfuscateButton.getPreferredSize().height));
@@ -1004,7 +1020,9 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
JPanel libraryAndLinkPanel = new JPanel(new FlowLayout());
LinkDialog linkDialog = new LinkDialog(mainPanel);
JToggleButton linkButton = new JToggleButton(View.getIcon("link16"));
LinkDialog linkDialog = new LinkDialog(mainPanel, linkButton);
libraryComboBox = new JComboBox<>();
libraryComboBox.addItem("AIR (airglobal.swc)");
@@ -1029,9 +1047,8 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
libraryAndLinkPanel.add(linksLabel);
JButton linkButton = new JButton(View.getIcon("link16"));
linkButton.setToolTipText(AppStrings.translate("button.abc.linkedSwfs.hint"));
linkButton.setToolTipText(AppStrings.translate("button.abc.linkedSwfs.hint"));
linkDialog.addSaveListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -1042,6 +1059,9 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
linkButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (!linkButton.isSelected()) {
return;
}
linkDialog.setLocationRelativeTo(linkButton);
Point loc = new Point(0, linkButton.getHeight());
SwingUtilities.convertPointToScreen(loc, linkButton);
@@ -1799,23 +1819,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
} else {
toggleButton.setSelected(Configuration.autoDeobfuscate.get());
}
}
private void deobfuscateOptionsButtonActionPerformed(ActionEvent evt) {
JPopupMenu popupMenu = new JPopupMenu();
JCheckBoxMenuItem simplifyExpressionsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.simplify_expressions"));
simplifyExpressionsMenuItem.setSelected(Configuration.simplifyExpressions.get());
simplifyExpressionsMenuItem.addActionListener(this::simplifyExpressionsMenuItemActionPerformed);
/*JCheckBoxMenuItem removeObfuscatedDeclarationsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.remove_obfuscated_declarations"));
removeObfuscatedDeclarationsMenuItem.setSelected(Configuration.deobfuscateAs12RemoveInvalidNamesAssignments.get());
removeObfuscatedDeclarationsMenuItem.addActionListener(this::removeObfuscatedDeclarationsMenuItemActionPerformed);
*/
popupMenu.add(simplifyExpressionsMenuItem);
//popupMenu.add(removeObfuscatedDeclarationsMenuItem);
JButton sourceButton = (JButton) evt.getSource();
popupMenu.show(sourceButton, 0, sourceButton.getHeight());
}
}
private void simplifyExpressionsMenuItemActionPerformed(ActionEvent evt) {
JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource();
src/com/jpexs/decompiler/flash/gui/abc/LinkDialog.java
+18 -1
View File
@@ -42,6 +42,7 @@ import javax.swing.JDialog;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JRootPane;
import javax.swing.JToggleButton;
import javax.swing.ListCellRenderer;
import javax.swing.ListModel;
import javax.swing.SwingUtilities;
@@ -58,6 +59,8 @@ public class LinkDialog extends JDialog {
private SWF swf;
private boolean overLinkButton = false;
private List<ActionListener> saveListeners = new ArrayList<>();
public void addSaveListener(ActionListener listener) {
@@ -74,8 +77,19 @@ public class LinkDialog extends JDialog {
}
}
public LinkDialog(MainPanel mainPanel) {
public LinkDialog(MainPanel mainPanel, JToggleButton linkButton) {
this.mainPanel = mainPanel;
linkButton.addMouseListener(new MouseAdapter() {
@Override
public void mouseEntered(MouseEvent e) {
overLinkButton = true;
}
@Override
public void mouseExited(MouseEvent e) {
overLinkButton = false;
}
});
setUndecorated(true);
setResizable(false);
getRootPane().setWindowDecorationStyle(JRootPane.NONE);
@@ -86,6 +100,9 @@ public class LinkDialog extends JDialog {
public void windowDeactivated(WindowEvent e) {
save(swf, false);
swf = null;
if (!overLinkButton) {
linkButton.setSelected(false);
}
dispose();
}
});
src/com/jpexs/decompiler/flash/gui/abc/SnapOptionsButton.java
+91
View File
@@ -0,0 +1,91 @@
/*
* Copyright (C) 2025 JPEXS
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.jpexs.decompiler.flash.gui.abc;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.gui.AppStrings;
import com.jpexs.decompiler.flash.gui.PopupButton;
import com.jpexs.decompiler.flash.gui.View;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JCheckBox;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JPopupMenu;
/**
*
* @author JPEXS
*/
public class SnapOptionsButton extends PopupButton {
public SnapOptionsButton() {
super(View.getIcon("snap16"));
setToolTipText(AppStrings.translate("button.snap_options"));
setMargin(new Insets(0, 0, 0, 0));
}
@Override
protected JPopupMenu getPopupMenu() {
JPopupMenu popupMenu = new JPopupMenu();
JCheckBox snapAlignMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_align"));
snapAlignMenuItem.setSelected(Configuration.snapAlign.get());
snapAlignMenuItem.addActionListener(this::snapAlignMenuItemActionPerformed);
popupMenu.add(snapAlignMenuItem);
JCheckBox snapToGuidesMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_guides"));
snapToGuidesMenuItem.setSelected(Configuration.snapToGuides.get());
snapToGuidesMenuItem.addActionListener(this::snapToGuidesMenuItemActionPerformed);
popupMenu.add(snapToGuidesMenuItem);
JCheckBox snapToPixelsMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_pixels"));
snapToPixelsMenuItem.setSelected(Configuration.snapToPixels.get());
snapToPixelsMenuItem.addActionListener(this::snapToPixelsMenuItemActionPerformed);
popupMenu.add(snapToPixelsMenuItem);
JCheckBox snapToObjectsMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_objects"));
snapToObjectsMenuItem.setSelected(Configuration.snapToObjects.get());
snapToObjectsMenuItem.addActionListener(this::snapToObjectsMenuItemActionPerformed);
popupMenu.add(snapToObjectsMenuItem);
return popupMenu;
}
private void snapAlignMenuItemActionPerformed(ActionEvent evt) {
JCheckBox menuItem = (JCheckBox) evt.getSource();
Configuration.snapAlign.set(menuItem.isSelected());
}
private void snapToGuidesMenuItemActionPerformed(ActionEvent evt) {
JCheckBox menuItem = (JCheckBox) evt.getSource();
Configuration.snapToGuides.set(menuItem.isSelected());
}
private void snapToPixelsMenuItemActionPerformed(ActionEvent evt) {
JCheckBox menuItem = (JCheckBox) evt.getSource();
Configuration.snapToPixels.set(menuItem.isSelected());
}
private void snapToObjectsMenuItemActionPerformed(ActionEvent evt) {
JCheckBox menuItem = (JCheckBox) evt.getSource();
Configuration.snapToObjects.set(menuItem.isSelected());
}
}