From ef4b97a1466a80959c7103237eaba50cce97fe9b Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sun, 1 Feb 2015 22:21:24 +0100 Subject: [PATCH] #785 Text search. Remember last choise. fixed --- .../decompiler/flash/gui/MainFrameClassicMenu.java | 2 +- .../jpexs/decompiler/flash/gui/MainFrameMenu.java | 2 +- .../decompiler/flash/gui/MainFrameRibbonMenu.java | 2 +- src/com/jpexs/decompiler/flash/gui/MainPanel.java | 12 +++++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java index 45f66c664..535ccd1cb 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java @@ -473,7 +473,7 @@ public class MainFrameClassicMenu extends MainFrameMenu implements ActionListene mainFrame.getPanel().reload(true); break; case ACTION_SEARCH: - search(false); + search(null); break; case ACTION_AUTO_DEOBFUSCATE: if (View.showConfirmDialog(mainFrame.getPanel(), translate("message.confirm.autodeobfuscate") + "\r\n" + (miAutoDeobfuscation.isSelected() ? translate("message.confirm.on") : translate("message.confirm.off")), translate("message.confirm"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) { diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java index d3531c77f..0a58fb2bb 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java @@ -156,7 +156,7 @@ public abstract class MainFrameMenu { mainFrame.getPanel().exportFla(swf); } - protected boolean search(boolean searchInText) { + protected boolean search(Boolean searchInText) { if (swf != null) { mainFrame.getPanel().searchInActionScriptOrText(searchInText); return true; diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index 0a4284ea9..07dd674eb 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -857,7 +857,7 @@ public class MainFrameRibbonMenu extends MainFrameMenu implements ActionListener mainFrame.getPanel().autoDeobfuscateChanged(); break; case ACTION_SEARCH: - search(false); + search(null); break; case ACTION_REPLACE: replace(); diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 608a55041..573cb35c7 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -1195,15 +1195,17 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec } } - public void searchInActionScriptOrText(boolean searchInText) { + public void searchInActionScriptOrText(Boolean searchInText) { if (searchDialog == null) { searchDialog = new SearchDialog(getMainFrame().getWindow(), false); } - if (searchInText) { - searchDialog.searchInTextsRadioButton.setSelected(true); - } else { - searchDialog.searchInASRadioButton.setSelected(true); + if (searchInText != null) { + if (searchInText) { + searchDialog.searchInTextsRadioButton.setSelected(true); + } else { + searchDialog.searchInASRadioButton.setSelected(true); + } } searchDialog.setVisible(true);