#785 Text search. Remember last choise. fixed

This commit is contained in:
honfika@gmail.com
2015-02-01 22:21:24 +01:00
parent 63c6edf0fb
commit ef4b97a146
4 changed files with 10 additions and 8 deletions

View File

@@ -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) {

View File

@@ -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;

View File

@@ -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();

View File

@@ -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);