diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java index 9d92e6d59..eb4742ecb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -179,6 +179,12 @@ public final class SWF implements SWFContainerItem, Timelined { * Default version of SWF file format */ public static final int DEFAULT_VERSION = 10; + + /** + * Maximum SWF file format version + * Needs to be fixed when SWF versions reaches this value + */ + public static final int MAX_VERSION = 30; /** * Tags inside of file diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFSearch.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFSearch.java index e9af2ba4f..ef6ee2f9c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFSearch.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFSearch.java @@ -94,7 +94,7 @@ public class SWFSearch { boolean valid = swf.fileSize > 0 && swf.version > 0 && (!swf.tags.isEmpty() || noCheck) - && swf.version < 30; // Needs to be fixed when SWF versions reaches this value + && swf.version <= SWF.MAX_VERSION; if (valid) { long limit = pmi.getPos(); MemoryInputStream is = new MemoryInputStream(mis.getAllRead(), (int) (long) addr, (int) limit); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java index d54c684d0..b15da3899 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java @@ -46,7 +46,8 @@ public enum FLAVersion { private static final Map versionToPlayerMap = new HashMap<>(); static { - versionToPlayerMap.put(10, "FlashPlayer10.0"); //10 & 10.1 + versionToPlayerMap.put(9, "FlashPlayer9.0"); // 9.0.115.0 + versionToPlayerMap.put(10, "FlashPlayer10.0"); //10 & 10.1 versionToPlayerMap.put(11, "FlashPlayer10.2"); versionToPlayerMap.put(12, "FlashPlayer10.3"); versionToPlayerMap.put(13, "FlashPlayer11.0"); @@ -64,6 +65,7 @@ public enum FLAVersion { versionToPlayerMap.put(25, "FlashPlayer14.0"); versionToPlayerMap.put(26, "FlashPlayer15.0"); versionToPlayerMap.put(27, "FlashPlayer16.0"); + versionToPlayerMap.put(28, "FlashPlayer17.0"); } private FLAVersion(String shortName, String applicationName, String xflVersion, int maxSwfVersion) { diff --git a/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/src/com/jpexs/decompiler/flash/gui/FontPanel.java index 70b502cb7..a3fd4a2c1 100644 --- a/src/com/jpexs/decompiler/flash/gui/FontPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/FontPanel.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.configuration.Configuration; +import com.jpexs.decompiler.flash.gui.helpers.TableLayoutHelper; import com.jpexs.decompiler.flash.tags.Tag; import com.jpexs.decompiler.flash.tags.base.FontTag; import com.jpexs.decompiler.flash.tags.base.TextTag; @@ -238,17 +239,6 @@ public class FontPanel extends JPanel { setEditable(false); } - private static void addTableSpaces(TableLayout tl, double size) { - int cols = tl.getNumColumn(); - int rows = tl.getNumRow(); - for (int x = 0; x <= cols; x++) { - tl.insertColumn(x * 2, size); - } - for (int y = 0; y <= rows; y++) { - tl.insertRow(y * 2, size); - } - } - private void initComponents() { contentScrollPane = new JScrollPane(); @@ -489,10 +479,9 @@ public class FontPanel extends JPanel { setLayout(new BorderLayout()); add(contentScrollPane, BorderLayout.CENTER); - addTableSpaces(tlAddCharsPanel, 10); - addTableSpaces(tlFontParamsPanel, 10); - addTableSpaces(tlAll, 10); - + TableLayoutHelper.addTableSpaces(tlAddCharsPanel, 10); + TableLayoutHelper.addTableSpaces(tlFontParamsPanel, 10); + TableLayoutHelper.addTableSpaces(tlAll, 10); } private void fontAddCharsButtonActionPerformed(ActionEvent evt) { diff --git a/src/com/jpexs/decompiler/flash/gui/HeaderInfoPanel.java b/src/com/jpexs/decompiler/flash/gui/HeaderInfoPanel.java index 6134f24d7..ec92c9db7 100644 --- a/src/com/jpexs/decompiler/flash/gui/HeaderInfoPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/HeaderInfoPanel.java @@ -17,10 +17,21 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.SWF; -import com.jpexs.decompiler.flash.gui.helpers.SpringUtilities; +import com.jpexs.decompiler.flash.gui.helpers.TableLayoutHelper; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.SpringLayout; +import javax.swing.JSpinner; +import javax.swing.SpinnerNumberModel; +import javax.swing.SwingConstants; +import javax.swing.border.BevelBorder; +import layout.TableLayout; /** * @@ -45,36 +56,129 @@ public class HeaderInfoPanel extends JPanel { private final JLabel displayRectTwipsLabel = new JLabel(); private final JLabel displayRectPixelsLabel = new JLabel(); + + private final JComboBox versionComboBox = new JComboBox<>(); + + private final JCheckBox gfxCheckBox = new JCheckBox(); + + private final JSpinner frameRateEditor = new JSpinner(); + + private final JPanel propertiesPanel = new JPanel(); + + private final JPanel buttonsPanel = new JPanel(); + + private final JButton editButton = new JButton(AppStrings.translate("button.edit"), View.getIcon("edit16")); + + private final JButton saveButton = new JButton(AppStrings.translate("button.save"), View.getIcon("save16")); + + private final JButton cancelButton = new JButton(AppStrings.translate("button.cancel"), View.getIcon("cancel16")); + + private final JPanel displayRectEditorPanel = new JPanel(); + + private final JSpinner xMinEditor = new JSpinner(); + + private final JSpinner xMaxEditor = new JSpinner(); + + private final JSpinner yMinEditor = new JSpinner(); + + private final JSpinner yMaxEditor = new JSpinner(); + + private SWF swf; public HeaderInfoPanel() { - setLayout(new SpringLayout()); + setLayout(new BorderLayout()); + + TableLayout tl; + propertiesPanel.setLayout(tl = new TableLayout(new double[][]{ + {TableLayout.PREFERRED, TableLayout.FILL}, + {TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED, + TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED, + TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED} + })); - add(new JLabel(AppStrings.translate("header.signature"))); - add(signatureLabel); - add(new JLabel(AppStrings.translate("header.compression"))); - add(compressionLabel); - add(new JLabel(AppStrings.translate("header.version"))); - add(versionLabel); - add(new JLabel(AppStrings.translate("header.gfx"))); - add(gfxLabel); - add(new JLabel(AppStrings.translate("header.filesize"))); - add(fileSizeLabel); - add(new JLabel(AppStrings.translate("header.framerate"))); - add(frameRateLabel); - add(new JLabel(AppStrings.translate("header.framecount"))); - add(frameCountLabel); - add(new JLabel(AppStrings.translate("header.displayrect"))); - add(displayRectTwipsLabel); - add(new JLabel("")); - add(displayRectPixelsLabel); + displayRectEditorPanel.setLayout(new FlowLayout(SwingConstants.WEST)); + xMinEditor.setPreferredSize(new Dimension(80, xMinEditor.getPreferredSize().height)); + xMaxEditor.setPreferredSize(new Dimension(80, xMaxEditor.getPreferredSize().height)); + yMinEditor.setPreferredSize(new Dimension(80, yMinEditor.getPreferredSize().height)); + yMaxEditor.setPreferredSize(new Dimension(80, yMaxEditor.getPreferredSize().height)); + displayRectEditorPanel.add(xMinEditor); + displayRectEditorPanel.add(xMaxEditor); + displayRectEditorPanel.add(yMinEditor); + displayRectEditorPanel.add(yMaxEditor); + + propertiesPanel.add(new JLabel(AppStrings.translate("header.signature")), "0,0"); + propertiesPanel.add(signatureLabel, "1,0"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.compression")), "0,1"); + propertiesPanel.add(compressionLabel, "1,1"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.version")), "0,2"); + propertiesPanel.add(versionLabel, "1,2"); + propertiesPanel.add(versionComboBox, "1,2"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.gfx")), "0,3"); + propertiesPanel.add(gfxLabel, "1,3"); + propertiesPanel.add(gfxCheckBox, "1,3"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.filesize")), "0,4"); + propertiesPanel.add(fileSizeLabel, "1,4"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.framerate")), "0,5"); + propertiesPanel.add(frameRateLabel, "1,5"); + propertiesPanel.add(frameRateEditor, "1,5"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.framecount")), "0,6"); + propertiesPanel.add(frameCountLabel, "1,6"); + propertiesPanel.add(new JLabel(AppStrings.translate("header.displayrect")), "0,7"); + propertiesPanel.add(displayRectTwipsLabel, "1,7"); + propertiesPanel.add(displayRectEditorPanel, "1,7"); + propertiesPanel.add(new JLabel(""), "0,8"); + propertiesPanel.add(displayRectPixelsLabel, "1,8"); - SpringUtilities.makeCompactGrid(this, - 9, 2, //rows, cols - 6, 6, //initX, initY - 6, 6); //xPad, yPad + for (int i = 1; i <= SWF.MAX_VERSION; i++) { + versionComboBox.addItem(Integer.toString(i)); + } + + add(propertiesPanel, BorderLayout.CENTER); + + editButton.setVisible(false); + editButton.addActionListener(this::editButtonActionPerformed); + + saveButton.setVisible(false); + saveButton.addActionListener(this::saveButtonActionPerformed); + + cancelButton.setVisible(false); + cancelButton.addActionListener(this::cancelButtonActionPerformed); + + buttonsPanel.setLayout(new FlowLayout()); + buttonsPanel.setBorder(new BevelBorder(BevelBorder.RAISED)); + buttonsPanel.add(editButton); + buttonsPanel.add(saveButton); + buttonsPanel.add(cancelButton); + add(buttonsPanel, BorderLayout.SOUTH); + + TableLayoutHelper.addTableSpaces(tl, 10); + setEditMode(false); } + private void editButtonActionPerformed(ActionEvent evt) { + setEditMode(true); + } + + private void saveButtonActionPerformed(ActionEvent evt) { + swf.version = Integer.parseInt((String) versionComboBox.getSelectedItem()); + swf.gfx = gfxCheckBox.isSelected(); + swf.frameRate = (int) frameRateEditor.getModel().getValue(); + swf.displayRect.Xmin = (int) xMinEditor.getModel().getValue(); + swf.displayRect.Xmax = (int) xMaxEditor.getModel().getValue(); + swf.displayRect.Ymin = (int) yMinEditor.getModel().getValue(); + swf.displayRect.Ymax = (int) yMaxEditor.getModel().getValue(); + + load(swf); + setEditMode(false); + } + + private void cancelButtonActionPerformed(ActionEvent evt) { + load(swf); + setEditMode(false); + } + public void load(SWF swf) { + this.swf = swf; signatureLabel.setText(swf.getHeaderBytes()); switch (swf.compression) { case LZMA: @@ -87,10 +191,18 @@ public class HeaderInfoPanel extends JPanel { compressionLabel.setText(AppStrings.translate("header.compression.none")); break; } + versionLabel.setText(Integer.toString(swf.version)); + versionComboBox.setSelectedItem(Integer.toString(swf.version)); + gfxLabel.setText(swf.gfx ? AppStrings.translate("yes") : AppStrings.translate("no")); + gfxCheckBox.setSelected(swf.gfx); + fileSizeLabel.setText(Long.toString(swf.fileSize)); + frameRateLabel.setText(Integer.toString(swf.frameRate)); + frameRateEditor.setModel(new SpinnerNumberModel(swf.frameRate, -0x80000000, 0x7fffffff, 1)); + frameCountLabel.setText("" + swf.frameCount); displayRectTwipsLabel.setText(AppStrings.translate("header.displayrect.value.twips") .replace("%xmin%", Integer.toString(swf.displayRect.Xmin)) @@ -102,6 +214,17 @@ public class HeaderInfoPanel extends JPanel { .replace("%ymin%", fmtDouble(swf.displayRect.Ymin / SWF.unitDivisor)) .replace("%xmax%", fmtDouble(swf.displayRect.Xmax / SWF.unitDivisor)) .replace("%ymax%", fmtDouble(swf.displayRect.Ymax / SWF.unitDivisor))); + + xMinEditor.setModel(new SpinnerNumberModel(swf.displayRect.Xmin, -0x80000000, 0x7fffffff, 1)); + xMaxEditor.setModel(new SpinnerNumberModel(swf.displayRect.Xmax, -0x80000000, 0x7fffffff, 1)); + yMinEditor.setModel(new SpinnerNumberModel(swf.displayRect.Ymin, -0x80000000, 0x7fffffff, 1)); + yMaxEditor.setModel(new SpinnerNumberModel(swf.displayRect.Ymax, -0x80000000, 0x7fffffff, 1)); + + setEditMode(false); + } + + public void clear() { + swf = null; } private String fmtDouble(double d) { @@ -111,4 +234,21 @@ public class HeaderInfoPanel extends JPanel { } return r; } + + private void setEditMode(boolean edit) { + versionLabel.setVisible(!edit); + versionComboBox.setVisible(edit); + gfxLabel.setVisible(!edit); + gfxCheckBox.setVisible(edit); + frameRateLabel.setVisible(!edit); + frameRateEditor.setVisible(edit); + + displayRectTwipsLabel.setVisible(!edit); + displayRectPixelsLabel.setVisible(!edit); + displayRectEditorPanel.setVisible(edit); + + editButton.setVisible(!edit); + saveButton.setVisible(edit); + cancelButton.setVisible(edit); + } } diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index d549db92c..774ce44c5 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -2003,6 +2003,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec private void clear() { dumpViewPanel.clear(); previewPanel.clear(); + headerPanel.clear(); if (abcPanel != null) { abcPanel.clearSwf(); } diff --git a/src/com/jpexs/decompiler/flash/gui/TextPanel.java b/src/com/jpexs/decompiler/flash/gui/TextPanel.java index a4a9d5e4f..ce5515b06 100644 --- a/src/com/jpexs/decompiler/flash/gui/TextPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/TextPanel.java @@ -158,6 +158,7 @@ public class TextPanel extends JPanel { textCancelButton = createButton("button.cancel", "cancel16", null, e -> cancelText()); // hide the buttonts to aviod panel resize problems on other views + textEditButton.setVisible(false); textSaveButton.setVisible(false); textCancelButton.setVisible(false); diff --git a/src/com/jpexs/decompiler/flash/gui/helpers/TableLayoutHelper.java b/src/com/jpexs/decompiler/flash/gui/helpers/TableLayoutHelper.java new file mode 100644 index 000000000..f7b6fcf80 --- /dev/null +++ b/src/com/jpexs/decompiler/flash/gui/helpers/TableLayoutHelper.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2010-2015 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui.helpers; + +import layout.TableLayout; + +/** + * + * @author JPEXS + */ +public class TableLayoutHelper { + + public static void addTableSpaces(TableLayout tl, double size) { + int cols = tl.getNumColumn(); + int rows = tl.getNumRow(); + for (int x = 0; x <= cols; x++) { + tl.insertColumn(x * 2, size); + } + for (int y = 0; y <= rows; y++) { + tl.insertRow(y * 2, size); + } + } +}