From 6c1e7ccad5c603c392e63deea5c2af43de25f23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 7 Jun 2014 07:43:02 +0200 Subject: [PATCH] Issue #578 Always on top fixed on search results, using dialog where possible --- src/com/jpexs/decompiler/flash/gui/AppDialog.java | 10 ++++++++++ .../flash/gui/{GraphFrame.java => GraphDialog.java} | 6 ++++-- src/com/jpexs/decompiler/flash/gui/MainFrame.java | 4 ++++ .../jpexs/decompiler/flash/gui/MainFrameClassic.java | 8 ++++++++ .../jpexs/decompiler/flash/gui/MainFrameRibbon.java | 12 ++++++++++++ src/com/jpexs/decompiler/flash/gui/MainPanel.java | 8 +++++++- src/com/jpexs/decompiler/flash/gui/SearchDialog.java | 4 +++- .../decompiler/flash/gui/SearchResultsDialog.java | 5 +++-- src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java | 10 ++++++++-- .../flash/gui/abc/ASMSourceEditorPane.java | 8 ++++++-- .../flash/gui/abc/DecompiledEditorPane.java | 6 ++++++ .../jpexs/decompiler/flash/gui/abc/UsageFrame.java | 4 +++- .../decompiler/flash/gui/action/ActionPanel.java | 7 +++---- .../decompiler/flash/gui/helpers/CheckResources.java | 4 ++-- ...{GraphFrame.properties => GraphDialog.properties} | 0 ...Frame_cs.properties => GraphDialog_cs.properties} | 0 ...Frame_de.properties => GraphDialog_de.properties} | 0 ...Frame_es.properties => GraphDialog_es.properties} | 0 ...Frame_fr.properties => GraphDialog_fr.properties} | 0 ...Frame_hu.properties => GraphDialog_hu.properties} | 0 ...Frame_nl.properties => GraphDialog_nl.properties} | 0 ...Frame_pt.properties => GraphDialog_pt.properties} | 0 ...pt_BR.properties => GraphDialog_pt_BR.properties} | 0 ...Frame_ru.properties => GraphDialog_ru.properties} | 0 ...Frame_sv.properties => GraphDialog_sv.properties} | 0 ...Frame_uk.properties => GraphDialog_uk.properties} | 0 ...Frame_zh.properties => GraphDialog_zh.properties} | 0 27 files changed, 79 insertions(+), 17 deletions(-) rename src/com/jpexs/decompiler/flash/gui/{GraphFrame.java => GraphDialog.java} (96%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame.properties => GraphDialog.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_cs.properties => GraphDialog_cs.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_de.properties => GraphDialog_de.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_es.properties => GraphDialog_es.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_fr.properties => GraphDialog_fr.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_hu.properties => GraphDialog_hu.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_nl.properties => GraphDialog_nl.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_pt.properties => GraphDialog_pt.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_pt_BR.properties => GraphDialog_pt_BR.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_ru.properties => GraphDialog_ru.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_sv.properties => GraphDialog_sv.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_uk.properties => GraphDialog_uk.properties} (100%) rename src/com/jpexs/decompiler/flash/gui/locales/{GraphFrame_zh.properties => GraphDialog_zh.properties} (100%) diff --git a/src/com/jpexs/decompiler/flash/gui/AppDialog.java b/src/com/jpexs/decompiler/flash/gui/AppDialog.java index 66ebea5f6..0e6fea342 100644 --- a/src/com/jpexs/decompiler/flash/gui/AppDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/AppDialog.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.AppStrings; import com.jpexs.decompiler.flash.configuration.Configuration; +import java.awt.Window; import java.util.ResourceBundle; import javax.swing.JDialog; import javax.swing.JRootPane; @@ -36,6 +37,15 @@ public abstract class AppDialog extends JDialog { getRootPane().setWindowDecorationStyle(JRootPane.FRAME); } } + + public AppDialog(Window owner) { + super(owner); + View.installEscapeCloseOperation(this); + if (Configuration.useRibbonInterface.get()) { + getRootPane().setWindowDecorationStyle(JRootPane.FRAME); + } + } + public String translate(String key) { return resourceBundle.getString(key); diff --git a/src/com/jpexs/decompiler/flash/gui/GraphFrame.java b/src/com/jpexs/decompiler/flash/gui/GraphDialog.java similarity index 96% rename from src/com/jpexs/decompiler/flash/gui/GraphFrame.java rename to src/com/jpexs/decompiler/flash/gui/GraphDialog.java index 7d456b0c8..5c39e66fd 100644 --- a/src/com/jpexs/decompiler/flash/gui/GraphFrame.java +++ b/src/com/jpexs/decompiler/flash/gui/GraphDialog.java @@ -26,6 +26,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Polygon; +import java.awt.Window; import java.awt.geom.AffineTransform; import java.awt.geom.Line2D; import java.util.HashMap; @@ -38,7 +39,7 @@ import javax.swing.JScrollPane; * * @author JPEXS */ -public class GraphFrame extends AppFrame { +public class GraphDialog extends AppDialog { private class GraphPanel extends JPanel { @@ -246,7 +247,8 @@ public class GraphFrame extends AppFrame { int frameWidthDiff; int frameHeightDiff; - public GraphFrame(Graph graph, String name) throws InterruptedException { + public GraphDialog(Window owner,Graph graph, String name) throws InterruptedException { + super(owner); setSize(500, 500); Container cnt = getContentPane(); cnt.setLayout(new BorderLayout()); diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/src/com/jpexs/decompiler/flash/gui/MainFrame.java index 39ca13716..b19e6fef9 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -16,6 +16,8 @@ */ package com.jpexs.decompiler.flash.gui; +import java.awt.Window; + /** * * @author JPEXS @@ -31,4 +33,6 @@ public interface MainFrame { public boolean isVisible(); public void setVisible(boolean b); + + public Window getWindow(); } diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameClassic.java b/src/com/jpexs/decompiler/flash/gui/MainFrameClassic.java index 1dc678c4a..a5c9f6f7b 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameClassic.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameClassic.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel; import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.Window; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.WindowAdapter; @@ -118,4 +119,11 @@ public final class MainFrameClassic extends AppFrame implements MainFrame { public MainPanel getPanel() { return panel; } + + @Override + public Window getWindow() { + return this; + } + + } diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java index 55b3ee12a..ce3da41aa 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java @@ -23,8 +23,11 @@ import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; +import java.awt.Window; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowStateListener; @@ -115,6 +118,8 @@ public final class MainFrameRibbon extends AppRibbonFrame implements MainFrame { }); View.centerScreen(this); + + } private static void getApplicationMenuButtons(Component comp, List ret) { @@ -215,4 +220,11 @@ public final class MainFrameRibbon extends AppRibbonFrame implements MainFrame { public MainPanel getPanel() { return panel; } + + @Override + public Window getWindow() { + return this; + } + + } diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 4b7056e0c..cae7696d0 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -272,6 +272,12 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec } } + public MainFrame getMainFrame() { + return mainFrame; + } + + + static { try { File.createTempFile("temp", ".swf").delete(); //First call to this is slow, so make it first @@ -1388,7 +1394,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec public void searchAs() { if (searchDialog == null) { - searchDialog = new SearchDialog(); + searchDialog = new SearchDialog(getMainFrame().getWindow()); } searchDialog.setVisible(true); if (searchDialog.result) { diff --git a/src/com/jpexs/decompiler/flash/gui/SearchDialog.java b/src/com/jpexs/decompiler/flash/gui/SearchDialog.java index 24bff2da0..092e68bc2 100644 --- a/src/com/jpexs/decompiler/flash/gui/SearchDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/SearchDialog.java @@ -20,6 +20,7 @@ import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Image; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -52,7 +53,8 @@ public class SearchDialog extends AppDialog implements ActionListener { public JRadioButton searchInTextsRadioButton = new JRadioButton(translate("checkbox.searchText")); public boolean result = false; - public SearchDialog() { + public SearchDialog(Window owner) { + super(owner); setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); Container cnt = getContentPane(); setSize(400, 150); diff --git a/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java b/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java index be1f3fbca..be67492b8 100644 --- a/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java @@ -21,6 +21,7 @@ import java.awt.BorderLayout; import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -48,7 +49,8 @@ public class SearchResultsDialog extends AppDialog implements ActionListener{ private final JButton gotoButton = new JButton(translate("button.goto")); private final JButton closeButton = new JButton(translate("button.close")); - public SearchResultsDialog(String text,SearchListener listener) { + public SearchResultsDialog(Window owner,String text,SearchListener listener) { + super(owner); setTitle(translate("dialog.title").replace("%text%", text)); Container cnt=getContentPane(); model = new DefaultListModel<>(); @@ -80,7 +82,6 @@ public class SearchResultsDialog extends AppDialog implements ActionListener{ cnt.add(sp,BorderLayout.CENTER); cnt.add(buttonsPanel,BorderLayout.SOUTH); pack(); - setAlwaysOnTop(true); View.centerScreen(this); View.setWindowIcon(this); } diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index f411f1460..555297300 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -164,6 +164,13 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se static final String ACTION_ADD_TRAIT = "ADDTRAIT"; + public MainPanel getMainPanel() { + return mainPanel; + } + + + + public boolean search(final String txt, boolean ignoreCase, boolean regexp) { if ((txt != null) && (!txt.isEmpty())) { searchPanel.setOptions(ignoreCase, regexp); @@ -216,12 +223,11 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se searchPanel.setSearchText(txt); - final ABCPanel that=this; View.execInEventDispatch(new Runnable() { @Override public void run() { - SearchResultsDialog sr=new SearchResultsDialog(txt,that); + SearchResultsDialog sr=new SearchResultsDialog<>(ABCPanel.this.mainPanel.getMainFrame().getWindow(),txt,ABCPanel.this); sr.setResults(found); sr.setVisible(true); } diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java b/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java index a63e87095..0b7399579 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java @@ -28,7 +28,7 @@ import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.traits.Trait; import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; -import com.jpexs.decompiler.flash.gui.GraphFrame; +import com.jpexs.decompiler.flash.gui.GraphDialog; import com.jpexs.decompiler.flash.gui.View; import com.jpexs.decompiler.flash.helpers.HilightedText; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; @@ -63,6 +63,10 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi private ScriptExportMode exportMode = ScriptExportMode.PCODE; private Trait trait; + public ABCPanel getAbcPanel(){ + return decompiledEditor.getAbcPanel(); + } + public ScriptExportMode getExportMode() { return exportMode; } @@ -168,7 +172,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi public void graph() { try { AVM2Graph gr = new AVM2Graph(abc.bodies.get(bodyIndex).code, abc, abc.bodies.get(bodyIndex), false, -1, -1, new HashMap(), new Stack(), new HashMap(), new ArrayList(), new HashMap(), abc.bodies.get(bodyIndex).code.visitCode(abc.bodies.get(bodyIndex))); - (new GraphFrame(gr, name)).setVisible(true); + (new GraphDialog(getAbcPanel().getMainPanel().getMainFrame().getWindow(),gr, name)).setVisible(true); } catch (InterruptedException ex) { Logger.getLogger(ASMSourceEditorPane.class.getName()).log(Level.SEVERE, null, ex); } diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java b/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java index 593757514..032aabe0e 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java @@ -67,6 +67,12 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL public void addScriptListener(Runnable l){ scriptListeners.add(l); } + + public ABCPanel getAbcPanel() { + return abcPanel; + } + + public void removeScriptListener(Runnable l){ scriptListeners.remove(l); diff --git a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java index 5cba90488..c79ffe2ec 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.abc.usages.InsideClassMultinameUsage; import com.jpexs.decompiler.flash.abc.usages.MethodMultinameUsage; import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage; +import com.jpexs.decompiler.flash.gui.AppDialog; import com.jpexs.decompiler.flash.gui.AppFrame; import com.jpexs.decompiler.flash.gui.View; import com.jpexs.decompiler.flash.tags.ABCContainerTag; @@ -44,7 +45,7 @@ import javax.swing.JScrollPane; * * @author JPEXS */ -public class UsageFrame extends AppFrame implements ActionListener, MouseListener { +public class UsageFrame extends AppDialog implements ActionListener, MouseListener { static final String ACTION_GOTO = "GOTO"; static final String ACTION_CANCEL = "CANCEL"; @@ -56,6 +57,7 @@ public class UsageFrame extends AppFrame implements ActionListener, MouseListene private final ABCPanel abcPanel; public UsageFrame(List abcTags, ABC abc, int multinameIndex, ABCPanel abcPanel, boolean definitions) { + super(abcPanel.getMainPanel().getMainFrame().getWindow()); this.abcPanel = abcPanel; List usages = definitions?abc.findMultinameDefinition(abcTags,multinameIndex):abc.findMultinameUsage(abcTags,multinameIndex); Multiname m = abc.constants.constant_multiname.get(multinameIndex); diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index afeda3562..930c7c753 100644 --- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -28,7 +28,7 @@ import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; -import com.jpexs.decompiler.flash.gui.GraphFrame; +import com.jpexs.decompiler.flash.gui.GraphDialog; import com.jpexs.decompiler.flash.gui.HeaderLabel; import com.jpexs.decompiler.flash.gui.Main; import com.jpexs.decompiler.flash.gui.MainPanel; @@ -251,12 +251,11 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene Main.stopWork(); searchPanel.setSearchText(txt); - final ActionPanel that=this; View.execInEventDispatch(new Runnable() { @Override public void run() { - SearchResultsDialog sr=new SearchResultsDialog(txt,that); + SearchResultsDialog sr=new SearchResultsDialog<>(ActionPanel.this.mainPanel.getMainFrame().getWindow(),txt,ActionPanel.this); sr.setResults(found); sr.setVisible(true); } @@ -705,7 +704,7 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene case ACTION_GRAPH: if (lastCode != null) { try { - GraphFrame gf = new GraphFrame(new ActionGraph(lastCode, new HashMap(), new HashMap(), new HashMap(), SWF.DEFAULT_VERSION), ""); + GraphDialog gf = new GraphDialog(mainPanel.getMainFrame().getWindow(),new ActionGraph(lastCode, new HashMap(), new HashMap(), new HashMap(), SWF.DEFAULT_VERSION), ""); gf.setVisible(true); } catch (InterruptedException ex) { Logger.getLogger(ActionPanel.class.getName()).log(Level.SEVERE, null, ex); diff --git a/src/com/jpexs/decompiler/flash/gui/helpers/CheckResources.java b/src/com/jpexs/decompiler/flash/gui/helpers/CheckResources.java index 3fd88c499..4483ab474 100644 --- a/src/com/jpexs/decompiler/flash/gui/helpers/CheckResources.java +++ b/src/com/jpexs/decompiler/flash/gui/helpers/CheckResources.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.gui.ErrorLogFrame; import com.jpexs.decompiler.flash.gui.ExportDialog; import com.jpexs.decompiler.flash.gui.FontEmbedDialog; import com.jpexs.decompiler.flash.gui.FontPreviewDialog; -import com.jpexs.decompiler.flash.gui.GraphFrame; +import com.jpexs.decompiler.flash.gui.GraphDialog; import com.jpexs.decompiler.flash.gui.LoadFromCacheFrame; import com.jpexs.decompiler.flash.gui.LoadFromMemoryFrame; import com.jpexs.decompiler.flash.gui.LoadingDialog; @@ -59,7 +59,7 @@ public class CheckResources { ExportDialog.class, FontEmbedDialog.class, FontPreviewDialog.class, - GraphFrame.class, + GraphDialog.class, // GraphTreeFrame.class, // empty LoadFromCacheFrame.class, LoadFromMemoryFrame.class, diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_cs.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_cs.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_cs.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_de.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_de.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_de.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_de.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_es.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_es.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_es.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_es.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_fr.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_fr.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_fr.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_hu.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_hu.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_hu.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_nl.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_nl.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_nl.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_nl.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_pt.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_pt.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_pt.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_pt.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_pt_BR.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_pt_BR.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_pt_BR.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_pt_BR.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_ru.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_ru.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_ru.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_ru.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_sv.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_sv.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_sv.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_sv.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_uk.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_uk.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_uk.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_uk.properties diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_zh.properties b/src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_zh.properties similarity index 100% rename from src/com/jpexs/decompiler/flash/gui/locales/GraphFrame_zh.properties rename to src/com/jpexs/decompiler/flash/gui/locales/GraphDialog_zh.properties