svg import warning, config for flash player panel delay

2026-06-21 19:06:03 +00:00 · 2015-12-19 10:41:01 +01:00
parent 71e3db5435
commit 29acbc0661
21 changed files with 57 additions and 35 deletions
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -104,6 +104,10 @@ public class Configuration {
    @ConfigurationCategory("display")
    public static final ConfigurationItem<Boolean> internalFlashViewer = null;

+    @ConfigurationDefaultInt(1000)
+    @ConfigurationCategory("display")
+    public static final ConfigurationItem<Integer> setMovieDelay = null;
+
    @ConfigurationDefaultBoolean(false)
    @ConfigurationCategory("display")
    public static final ConfigurationItem<Boolean> dumpView = null;
@@ -529,9 +533,10 @@ public class Configuration {
    @ConfigurationCategory("script")
    public static final ConfigurationItem<Boolean> debugHalt = null;

-    @ConfigurationDefaultBoolean(false)
+    @ConfigurationDefaultBoolean(true)
+    @ConfigurationName("warning.svgImport")
    @ConfigurationCategory("import")
-    public static final ConfigurationItem<Boolean> experimentalSvgImportEnabled = null;
+    public static final ConfigurationItem<Boolean> warningSvgImport = null;

    private enum OSId {

--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -2615,11 +2615,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
        }
        if (item instanceof ShapeTag) {
            ShapeTag st = (ShapeTag) item;
-            String filter = "filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp";
-            if (Configuration.experimentalSvgImportEnabled.get()) {
-                filter += ";*.svg";
-            }
-
+            String filter = "filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp;*.svg";
            File selectedFile = showImportFileChooser(filter);
            if (selectedFile != null) {
                File selfile = Helper.fixDialogFile(selectedFile);
@@ -2627,6 +2623,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
                String svgText = null;
                if (".svg".equals(Path.getExtension(selfile))) {
                    svgText = Helper.readTextFile(selfile.getAbsolutePath());
+                    showSvgImportWarning();
                } else {
                    data = Helper.readFile(selfile.getAbsolutePath());
                }
@@ -2668,11 +2665,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se

        if (item instanceof ShapeTag) {
            ShapeTag st = (ShapeTag) item;
-            String filter = "filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp";
-            if (Configuration.experimentalSvgImportEnabled.get()) {
-                filter += ";*.svg";
-            }
-
+            String filter = "filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp;*.svg";
            File selectedFile = showImportFileChooser(filter);
            if (selectedFile != null) {
                File selfile = Helper.fixDialogFile(selectedFile);
@@ -2680,6 +2673,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
                String svgText = null;
                if (".svg".equals(Path.getExtension(selfile))) {
                    svgText = Helper.readTextFile(selfile.getAbsolutePath());
+                    showSvgImportWarning();
                } else {
                    data = Helper.readFile(selfile.getAbsolutePath());
                }
@@ -2702,6 +2696,10 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
        }
    }

+    private void showSvgImportWarning() {
+        View.showMessageDialog(null, AppStrings.translate("message.warning.svgImportExperimental"), AppStrings.translate("message.warning"), JOptionPane.WARNING_MESSAGE, Configuration.warningSvgImport);
+    }
+
    public void replaceAlphaButtonActionPerformed(ActionEvent evt) {
        TreeItem item = tagTree.getCurrentTreeItem();
        if (item == null) {
@@ -2794,7 +2792,19 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se

                @Override
                public String getDescription() {
-                    return translate(filterName);
+                    StringBuilder extStr = new StringBuilder();
+                    boolean first = true;
+                    for (String ext : extensions) {
+                        if (first) {
+                            first = false;
+                        } else {
+                            extStr.append(",");
+                        }
+
+                        extStr.append("*").append(ext);
+                    }
+
+                    return translate(filterName).replace("%extensions%", extStr);
                }
            };
            if (first) {
--- a/src/com/jpexs/decompiler/flash/gui/View.java
+++ b/src/com/jpexs/decompiler/flash/gui/View.java
@@ -472,7 +472,7 @@ public class View {
        return showConfirmDialog(parentComponent, message, title, optionType, JOptionPane.PLAIN_MESSAGE, showAgainConfig, defaultOption);
    }

-    public static int showConfirmDialog(final Component parentComponent, String message, final String title, final int optionType, final int messageTyp, ConfigurationItem<Boolean> showAgainConfig, int defaultOption) {
+    public static int showConfirmDialog(final Component parentComponent, String message, final String title, final int optionType, final int messageType, ConfigurationItem<Boolean> showAgainConfig, int defaultOption) {

        JLabel warLabel = new JLabel("<html>" + message.replace("\r\n", "<br>") + "</html>");
        final JPanel warPanel = new JPanel(new BorderLayout());
@@ -487,7 +487,7 @@ public class View {

        final int ret[] = new int[1];
        execInEventDispatch(() -> {
-            ret[0] = JOptionPane.showConfirmDialog(parentComponent, warPanel, title, optionType, messageTyp);
+            ret[0] = JOptionPane.showConfirmDialog(parentComponent, warPanel, title, optionType, messageType);
        });
        showAgainConfig.set(!donotShowAgainCheckBox.isSelected());
        return ret[0];
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -403,5 +403,8 @@ tip = Tip:\u0020
 config.name.gui.action.splitPane.vars.dividerLocationPercent = (Internal) AS1/2 Debug menu splitter location
 config.description.gui.action.splitPane.vars.dividerLocationPercent = 

-config.name.experimentalSvgImportEnabled = Enable experimental SVG import
-config.description.experimentalSvgImportEnabled =
+config.name.setMovieDelay = Delay before changing the SWF in external player in ms
+config.description.setMovieDelay = Not recommended to change this value below 1000ms
+
+config.name.warning.svgImport = Warn on SVG import
+config.description.warning.svgImport = 
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = No identifier found under cursor
 message.rename.notfound.title = Not found
 message.rename.renamed = Identifiers renamed: %count%

-filter.images = Images (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Images (%extensions%)
 filter.fla = %version% Document (*.fla)
 filter.xfl = %version% Uncompressed Document (*.xfl)
 filter.swf = SWF files (*.swf)
@@ -701,3 +701,4 @@ menu.file.start.debugpcode = Debug P-code

 #after 7.1.2
 button.replaceNoFill = Replace - Update bounds...
+message.warning.svgImportExperimental = Not all SVG features are supported. Only solid color fill mode is supported. Please check the log after import.
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ca.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ca.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = No s'ha trobat cap identificador sota el cu
 message.rename.notfound.title = No s'ha trobat
 message.rename.renamed = Identificadors renomenats: %count%

-filter.images = Imatges (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Imatges (%extensions%)
 filter.fla = Document %version% (*.fla)
 filter.xfl = Document Descomprimit %version% (*.xfl)
 filter.swf = Fitxers SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Na m\u00edst\u011b kurzoru nen\u00ed \u017e
 message.rename.notfound.title = Nenalezeno
 message.rename.renamed = Po\u010det p\u0159ejmenovan\u00fdch identifik\u00e1tor\u016f: %count%

-filter.images = Obr\u00e1zky (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Obr\u00e1zky (%extensions%)
 filter.fla = Dokument %version% (*.fla)
 filter.xfl = Nekomprimovan\u00fd Dokument %version% (*.xfl)
 filter.swf = SWF soubory (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_de.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_de.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Kein Bezeichner unter dem Cursor gefunden
 message.rename.notfound.title = Nicht gefunden
 message.rename.renamed = Bezeichner umbenannt: %count%

-filter.images = Bilder (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Bilder (%extensions%)
 filter.fla = Flash CS 6 Dokument (*.fla)
 filter.xfl = Flash CS 6 Unkomprimiertes Dokument (*.xfl)
 filter.swf = SWF Datei (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_es.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_es.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = No se encontr\u00f3 ning\u00fan identificad
 message.rename.notfound.title = No encontrado
 message.rename.renamed = Identificadores renombrados: %count%

-filter.images = Im\u00e1genes (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Im\u00e1genes (%extensions%)
 filter.fla = Documento %version% (*.fla)
 filter.xfl = Documento no comprimido %version% (*.xfl)
 filter.swf = Archivos SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Aucun identificateur trouv\u00e9 sous le cu
 message.rename.notfound.title = Pas trouv\u00e9
 message.rename.renamed = Nombre d'identificateurs renomm\u00e9s : %count%

-filter.images = Images (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Images (%extensions%)
 filter.fla = Document %version% (*.fla)
 filter.xfl = Document d\u00e9compress\u00e9 %version% (*.xfl)
 filter.swf = Fichiers SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Azonos\u00edt\u00f3 nem tal\u00e1lhat\u00f3
 message.rename.notfound.title = Nem tal\u00e1lhat\u00f3
 message.rename.renamed = %count% azonos\u00edt\u00f3 \u00e1tnevezve

-filter.images = K\u00e9pek (*.jpg,*.gif,*.png,*.bmp)
+filter.images = K\u00e9pek (%extensions%)
 filter.fla = %version% Dokumentum (*.fla)
 filter.xfl = %version% T\u00f6m\u00f6r\u00edtetlen dokumentum (*.xfl)
 filter.swf = SWF f\u00e1ljok (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_it.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_it.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Nessun identificatore alla posizione corren
 message.rename.notfound.title = Non trovato
 message.rename.renamed = %count% identificatori renominati.

-filter.images = Immagini (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Immagini (%extensions%)
 filter.fla = Documento %version% (*.fla)
 filter.xfl = Documento non compresso %version%(*.xfl)
 filter.swf = File SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_nl.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_nl.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Er is geen identifier bij de cursor gevonde
 message.rename.notfound.title = Niet gevonden
 message.rename.renamed = Identifiers werden hernoemd: %count%

-filter.images = Images (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Images (%extensions%)
 filter.fla = %version% Document (*.fla)
 filter.xfl = %version% Ongecomprimeerde Document (*.xfl)
 filter.swf = SWF-bestanden (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pl.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pl.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Nie znaleziono identyfikatora pod kursorem
 message.rename.notfound.title = Nie znaleziono
 message.rename.renamed = Zmieniono nazwy identyfikator\u00f3w: %count%

-filter.images = Obrazy (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Obrazy (%extensions%)
 filter.fla = %version% Dokument (*.fla)
 filter.xfl = %version% Nieskompresowany Dokument (*.xfl)
 filter.swf = Pliki SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pt.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pt.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Identificador n\u00e3o encontrado no cursor
 message.rename.notfound.title = N\u00e3o Encontrado
 message.rename.renamed = Identificadores Renomeados: %count%

-filter.images = Imagens (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Imagens (%extensions%)
 filter.fla = %version% Documento (*.fla)
 filter.xfl = %version% Documento n\u00e3o comprimido (*.xfl)
 filter.swf = Ficheiros SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pt_BR.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_pt_BR.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = Identificador n\u00e3o encontrado no cursor
 message.rename.notfound.title = N\u00e3o Encontrado
 message.rename.renamed = Identificadores Renomeados: %count%

-filter.images = Ficheiros de Tipo Imagem (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Ficheiros de Tipo Imagem (%extensions%)
 filter.fla = %version% Documento (*.fla)
 filter.xfl = %version% Documento n\u00e3o comprimido (*.xfl)
 filter.swf = Ficheiros SWF (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = \u041f\u043e\u0434 \u043a\u0443\u0440\u0441
 message.rename.notfound.title = \u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e
 message.rename.renamed = \u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u0432 \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u043e: %count%

-filter.images = \u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f (*.jpg,*.gif,*.png,*.bmp)
+filter.images = \u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f (%extensions%)
 filter.fla = \u041f\u0440\u043e\u0435\u043a\u0442 %version% (*.fla)
 filter.xfl = \u041d\u0435\u0441\u0436\u0430\u0442\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 %version% (*.xfl)
 filter.swf = SWF \u0444\u0430\u0439\u043b\u044b (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_sv.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_sv.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = ingen identifiering hittades under mark\u00
 message.rename.notfound.title = Hittades inte
 message.rename.renamed = Identifierare som har \u00e4ndrat namn: %count%

-filter.images = Bilder (*.jpg,*.gif,*.png,*.bmp)
+filter.images = Bilder (%extensions%)
 filter.fla = %version% Dokument (*.fla)
 filter.xfl = %version% Okomprimerat Dokument (*.xfl)
 filter.swf = SWF filer (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_uk.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_uk.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = \u041f\u0456\u0434 \u043a\u0443\u0440\u0441
 message.rename.notfound.title = \u041d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e
 message.rename.renamed = \u0406\u0434\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0442\u043e\u0440\u0456\u0432 \u043f\u0435\u0440\u0435\u0439\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u043e: %count%

-filter.images = \u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f (*.jpg,*.gif,*.png,*.bmp)
+filter.images = \u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f (%extensions%)
 filter.fla = \u041f\u0440\u043e\u0435\u043a\u0442 %version% (*.fla)
 filter.xfl = \u041d\u0435\u0441\u0442\u0438\u0441\u043d\u0443\u0442\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 %version% (*.xfl)
 filter.swf = SWF \u0444\u0430\u0439\u043b\u0438 (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_zh.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_zh.properties
@@ -126,7 +126,7 @@ message.rename.notfound.identifier = \u5728\u5149\u6807\u4e0b\u65b9\u6ca1\u6709\
 message.rename.notfound.title = \u6ca1\u6709\u627e\u5230
 message.rename.renamed = \u6807\u8bc6\u7b26\u91cd\u547d\u540d\u6570\uff1a %count%

-filter.images = \u56fe\u7247 (*.jpg,*.gif,*.png,*.bmp)
+filter.images = \u56fe\u7247 (%extensions%)
 filter.fla = %version% \u6587\u4ef6 (*.fla)
 filter.xfl = %version% \u672a\u538b\u7f29\u6587\u4ef6 (*.xfl)
 filter.swf = SWF \u6587\u4ef6 (*.swf)
--- a/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
@@ -16,6 +16,7 @@
 */
 package com.jpexs.decompiler.flash.gui.player;

+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.gui.FlashUnsupportedException;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.javactivex.ActiveX;
@@ -46,6 +47,8 @@ import java.util.regex.Pattern;
 */
 public final class FlashPlayerPanel extends Panel implements Closeable, MediaDisplay {

+    private final int setMovieDelay = Configuration.setMovieDelay.get();
+
    private final List<MediaDisplayListener> listeners = new ArrayList<>();

    private final ShockwaveFlash flash;
@@ -254,7 +257,7 @@ public final class FlashPlayerPanel extends Panel implements Closeable, MediaDis

    public synchronized void displaySWF(final String flashName, final Color bgColor, final float frameRate) {

-        //Minimum of 1000 ms delay before calling flash.setMovie to avoid illegalAccess errors
+        // Minimum of 1000 ms (setMovieDelay) delay before calling flash.setMovie to avoid illegalAccess errors
        if (playQueue == null) {
            playQueue = new Thread() {
                long lastTime;
@@ -279,7 +282,7 @@ public final class FlashPlayerPanel extends Panel implements Closeable, MediaDis
                                movieToPlay = null;
                            }
                            try {
-                                Thread.sleep(1000);
+                                Thread.sleep(setMovieDelay);
                            } catch (InterruptedException ex) {
                                break;
                            }