From 63c6edf0fb3509d34049df751a5a6bc99332e673 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sun, 1 Feb 2015 20:47:28 +0100 Subject: [PATCH] #783 No OK box when edited script or text was saved (show messages only if it was't saved or with errors) --- .../decompiler/flash/configuration/Configuration.java | 8 ++++++++ src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java | 2 +- src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java | 4 +++- .../jpexs/decompiler/flash/gui/action/ActionPanel.java | 4 ++-- .../flash/gui/locales/AdvancedSettingsDialog.properties | 6 ++++++ .../gui/locales/AdvancedSettingsDialog_hu.properties | 6 ++++++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index 90d6072bd..ea7b3922b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -343,6 +343,14 @@ public class Configuration { @ConfigurationCategory("script") public static final ConfigurationItem warningExperimentalAS3Edit = null; + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static final ConfigurationItem showCodeSavedMessage = null; + + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static final ConfigurationItem showTraitSavedMessage = null; + @ConfigurationDefaultBoolean(true) @ConfigurationCategory("export") public static final ConfigurationItem packJavaScripts = null; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index cd81e4eeb..3b5f3e282 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -818,7 +818,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se } setDecompiledEditMode(false); reload(); - View.showMessageDialog(this, AppStrings.translate("message.action.saved")); + View.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage); } catch (AVM2ParseException ex) { abc.script_info.get(oldIndex).delete(abc, false); decompiledTextArea.gotoLine((int) ex.line); diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java index e097abc8d..fcdece3c9 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java @@ -17,6 +17,7 @@ package com.jpexs.decompiler.flash.gui.abc; import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.gui.AppStrings; import com.jpexs.decompiler.flash.gui.HeaderLabel; import com.jpexs.decompiler.flash.gui.View; @@ -33,6 +34,7 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.BevelBorder; @@ -223,7 +225,7 @@ public class DetailPanel extends JPanel implements ActionListener { @Override protected void done() { setEditMode(false); - View.showMessageDialog(null, AppStrings.translate("message.trait.saved")); + View.showMessageDialog(null, AppStrings.translate("message.trait.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showTraitSavedMessage); } }; worker.execute(); diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index 02bed1d1a..bbd2e43cd 100644 --- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -785,7 +785,7 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene } src.setModified(); setSource(this.src, false); - View.showMessageDialog(this, AppStrings.translate("message.action.saved")); + View.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage); saveButton.setVisible(false); cancelButton.setVisible(false); editButton.setVisible(true); @@ -813,7 +813,7 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene src.setModified(); setSource(src, false); - View.showMessageDialog(this, AppStrings.translate("message.action.saved")); + View.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage); setDecompiledEditMode(false); } catch (IOException ex) { Logger.getLogger(ActionPanel.class.getName()).log(Level.SEVERE, "IOException during action compiling", ex); diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index f903aa6fd..315c3313c 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -308,3 +308,9 @@ config.description.textImportResizeTextBoundsMode = Text bounds resize mode afte config.name.showCloseConfirmation = Show again SWF close confirmation config.description.showCloseConfirmation = Show again SWF close confirmation for modified files. + +config.name.showCodeSavedMessage = Show again code saved message +config.description.showCodeSavedMessage = Show again code saved message + +config.name.showTraitSavedMessage = Show again trait saved message +config.description.showTraitSavedMessage = Show again trait saved message diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties index c42125cdb..b846ed534 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties @@ -308,3 +308,9 @@ config.description.textImportResizeTextBoundsMode = Sz\u00f6veg hat\u00e1r \u00e config.name.showCloseConfirmation = SWF bez\u00e1r\u00e1si meger\u0151s\u00edt\u00e9s \u00fajb\u00f3li mutat\u00e1sa config.description.showCloseConfirmation = SWF bez\u00e1r\u00e1si meger\u0151s\u00edt\u00e9s \u00fajb\u00f3li mutat\u00e1sa m\u00f3dosult f\u00e1jlok eset\u00e9n. + +config.name.showCodeSavedMessage = K\u00f3d mentve \u00fczenet \u00fajra mutat\u00e1sa +config.description.showCodeSavedMessage = K\u00f3d mentve \u00fczenet \u00fajra mutat\u00e1sa + +config.name.showTraitSavedMessage = Trait mentve \u00fczenet \u00fajra mutat\u00e1sa +config.description.showTraitSavedMessage = Trait mentve \u00fczenet \u00fajra mutat\u00e1sa