diff --git a/CHANGELOG.md b/CHANGELOG.md index 047de48f0..3ecc817e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added - StartSound and StartSound2 show characterId/class in the tag tree +- Folder preview for sounds ### Fixed - Debugger - getting children of top level variables diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java index 05bc5fa62..95090d0a4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java @@ -262,6 +262,11 @@ public class SoundStreamHead2Tag extends SoundStreamHeadTypeTag { public String toString() { return getName() + " (" + virtualCharacterId + ")"; } + + @Override + public String getUniqueId() { + return "" + virtualCharacterId; + } //getNeededCharacters intentionally not defined @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java index 079e21052..fbb98fc55 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java @@ -272,6 +272,11 @@ public class SoundStreamHeadTag extends SoundStreamHeadTypeTag { return getName() + " (" + virtualCharacterId + ")"; } + @Override + public String getUniqueId() { + return "" + virtualCharacterId; + } + //getNeededCharacters intentionally not defined @Override public void setSoundSize(boolean soundSize) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalStreamSound.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalStreamSound.java index 5fe400328..8bb45f8e3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalStreamSound.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalStreamSound.java @@ -243,6 +243,11 @@ public class DefineExternalStreamSound extends Tag implements CharacterIdTag, So public String toString() { return getName() + " (" + virtualCharacterId + ")"; } + + @Override + public String getUniqueId() { + return "" + virtualCharacterId; + } @Override public void getTagInfo(TagInfo tagInfo) { diff --git a/src/com/jpexs/decompiler/flash/gui/FolderListPanel.java b/src/com/jpexs/decompiler/flash/gui/FolderListPanel.java index ffadb1dd1..e8a3d5193 100644 --- a/src/com/jpexs/decompiler/flash/gui/FolderListPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/FolderListPanel.java @@ -242,10 +242,12 @@ public class FolderListPanel extends JPanel { icon.paintIcon(l, g, x * CELL_WIDTH + BORDER_SIZE + PREVIEW_SIZE / 2 - icon.getIconWidth() / 2, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE / 2 - icon.getIconHeight() / 2); String s; if (treeItem instanceof Tag) { + Tag t = (Tag) treeItem; + String uniqueId = t.getUniqueId(); s = ((Tag) treeItem).getTagName(); - if (treeItem instanceof CharacterTag) { - s = s + " (" + ((CharacterTag) treeItem).getCharacterId() + ")"; - } + if (uniqueId != null) { + s = s + " (" + uniqueId + ")"; + } } else { s = treeItem.toString(); } diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 89438052c..f3b35e849 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -6049,7 +6049,10 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se private void showFolderPreview(FolderItem item) { String folderName = item.getName(); - if (TagTreeModel.FOLDER_OTHERS.equals(folderName) || TagTreeModel.FOLDER_SCRIPTS.equals(folderName)) { + if (TagTreeModel.FOLDER_OTHERS.equals(folderName) + || TagTreeModel.FOLDER_SCRIPTS.equals(folderName) + || TagTreeModel.FOLDER_SOUNDS.equals(folderName) + ) { showFolderList(tagTree.getFullModel().getTreePath(item)); return; }