diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java index 8b8918028..29943a92f 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java @@ -1125,7 +1125,7 @@ public abstract class MainFrameMenu implements MenuBuilder { setMenuEnabled("/tools/search", openableSelected); setMenuEnabled("/tools/replace", swfSelected); - //setMenuEnabled("/file/view/timeline", swfSelected); + //setMenuEnabled("/file/view/easy", swfSelected); setMenuEnabled("/tools/abcExplorer", isAs3); setMenuEnabled("/tools/gotoDocumentClass", hasAbc); @@ -1178,8 +1178,8 @@ public abstract class MainFrameMenu implements MenuBuilder { case MainPanel.VIEW_DUMP: setGroupSelection("view", "/file/view/viewHex"); break; - case MainPanel.VIEW_TIMELINE: - setMenuChecked("/file/view/timeline", true); + case MainPanel.VIEW_EASY: + setMenuChecked("/file/view/easy", true); break; } } @@ -1273,7 +1273,7 @@ public abstract class MainFrameMenu implements MenuBuilder { addToggleMenuItem("/file/view/viewResources", translate("menu.file.view.resources"), "view", "viewresources16", this::viewResourcesActionPerformed, PRIORITY_MEDIUM, null); addToggleMenuItem("/file/view/viewTagList", translate("menu.file.view.tagList"), "view", "taglist16", this::viewTagListActionPerformed, PRIORITY_MEDIUM, null); addToggleMenuItem("/file/view/viewHex", translate("menu.file.view.hex"), "view", "viewhex16", this::viewHexActionPerformed, PRIORITY_MEDIUM, null); - addToggleMenuItem("/file/view/timeline", translate("menu.tools.timeline"), null, "timeline32", this::timelineActionPerformed, PRIORITY_TOP, null); + addToggleMenuItem("/file/view/easy", translate("menu.file.view.easy"), null, "easy32", this::easyActionPerformed, PRIORITY_TOP, null); finishMenu("/file/view"); addSeparator("/file"); @@ -1525,8 +1525,8 @@ public abstract class MainFrameMenu implements MenuBuilder { case MainPanel.VIEW_DUMP: setMenuChecked("/file/view/viewHex", true); break; - case MainPanel.VIEW_TIMELINE: - setMenuChecked("/file/view/timeline", true); + case MainPanel.VIEW_EASY: + setMenuChecked("/file/view/easy", true); break; } } @@ -1539,7 +1539,7 @@ public abstract class MainFrameMenu implements MenuBuilder { Configuration.dumpView.set(false); mainFrame.getPanel().showView(MainPanel.VIEW_RESOURCES); setGroupSelection("view", "/file/view/viewResources"); - setMenuChecked("/file/view/timeline", false); + setMenuChecked("/file/view/easy", false); } private void viewHexActionPerformed(ActionEvent evt) { @@ -1555,7 +1555,7 @@ public abstract class MainFrameMenu implements MenuBuilder { mainPanel.showView(MainPanel.VIEW_DUMP); setGroupSelection("view", "/file/view/viewHex"); - setMenuChecked("/file/view/timeline", false); + setMenuChecked("/file/view/easy", false); } private void viewTagListActionPerformed(ActionEvent evt) { @@ -1567,7 +1567,7 @@ public abstract class MainFrameMenu implements MenuBuilder { MainPanel mainPanel = mainFrame.getPanel(); mainPanel.showView(MainPanel.VIEW_TAGLIST); setGroupSelection("view", "/file/view/viewTagList"); - setMenuChecked("/file/view/timeline", false); + setMenuChecked("/file/view/easy", false); } private void debuggerSwitchActionPerformed(ActionEvent evt) { @@ -1582,10 +1582,10 @@ public abstract class MainFrameMenu implements MenuBuilder { //setMenuEnabled("/tools/debugger/debuggerInjectLoader", isMenuChecked("/tools/debugger/debuggerSwitch")); } - private void timelineActionPerformed(ActionEvent evt) { - if (isMenuChecked("/file/view/timeline")) { - if (!mainFrame.getPanel().showView(MainPanel.VIEW_TIMELINE)) { - setMenuChecked("/file/view/timeline", false); + private void easyActionPerformed(ActionEvent evt) { + if (isMenuChecked("/file/view/easy")) { + if (!mainFrame.getPanel().showView(MainPanel.VIEW_EASY)) { + setMenuChecked("/file/view/easy", false); } else { setGroupSelection("view", null); } diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 1536d56ae..3425d1a9d 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -388,7 +388,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se private static final String WELCOME_PANEL = "WELCOMEPANEL"; - private static final String TIMELINE_PANEL = "TIMELINEPANEL"; + private static final String EASY_PANEL = "EASYPANEL"; private static final String RESOURCES_VIEW = "RESOURCES"; @@ -396,13 +396,13 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se private static final String TAGLIST_VIEW = "TAGLIST"; - private static final String TIMELINE_VIEW = "TIMELINE"; + private static final String EASY_VIEW = "EASY"; private final JPersistentSplitPane splitPane1; private final JPersistentSplitPane splitPane2; - private JTabbedPane detailPanel; + private final JTabbedPane detailPanel; private QuickTreeFindPanel quickTreeFindPanel; @@ -1305,7 +1305,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se contentPanel = new JPanel(new CardLayout()); contentPanel.add(welcomePanel, WELCOME_PANEL); contentPanel.add(splitPane1, SPLIT_PANE1); - contentPanel.add(easyPanel, TIMELINE_PANEL); + contentPanel.add(easyPanel, EASY_PANEL); add(contentPanel); showContentPanelCard(WELCOME_PANEL); @@ -1562,7 +1562,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se } } break; - case VIEW_TIMELINE: + case VIEW_EASY: updateUi(easyPanel.getSwf()); break; } @@ -1572,8 +1572,8 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se View.checkAccess(); if (isWelcomeScreen) { - if (currentView == VIEW_TIMELINE) { - showContentPanelCard(TIMELINE_PANEL); + if (currentView == VIEW_EASY) { + showContentPanelCard(EASY_PANEL); } else { showContentPanelCard(SPLIT_PANE1); } @@ -2544,7 +2544,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se return null; } - if (currentView == VIEW_TIMELINE) { + if (currentView == VIEW_EASY) { return easyPanel.getSwf(); } if (treePanelMode == TreePanelMode.TAG_TREE) { @@ -5491,7 +5491,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se return -1; } - if (currentView == VIEW_TIMELINE) { + if (currentView == VIEW_EASY) { return -1; } TreePath path = getCurrentTree().getFullModel().getTreePath(treeItem); @@ -5518,7 +5518,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se } return null; } - if (currentView == VIEW_TIMELINE) { + if (currentView == VIEW_EASY) { return null; } @@ -5583,7 +5583,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se public static final int VIEW_DUMP = 1; - public static final int VIEW_TIMELINE = 2; + public static final int VIEW_EASY = 2; public static final int VIEW_TAGLIST = 3; @@ -5709,7 +5709,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se reload(true); updateUiWithCurrentOpenable(); return true; - case VIEW_TIMELINE: + case VIEW_EASY: SWF swf = getCurrentSwf(); pinsPanel.setVisible(false); currentView = view; @@ -5718,7 +5718,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se easyPanel.setSwfs(new ArrayList<>(swfs)); easyPanel.setSwf(swf); if (!isWelcomeScreen) { - showContentPanelCard(TIMELINE_PANEL); + showContentPanelCard(EASY_PANEL); } return true; case VIEW_TAGLIST: @@ -6086,7 +6086,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se treeItem = (TreeItem) treePath.getLastPathComponent(); } - if (currentView == VIEW_TIMELINE) { + if (currentView == VIEW_EASY) { if (treeItem != null) { Openable op = treeItem.getOpenable(); if (op instanceof SWF) { diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/easy16.png b/src/com/jpexs/decompiler/flash/gui/graphics/easy16.png new file mode 100644 index 000000000..fdbb9d5d7 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/easy16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/easy32.png b/src/com/jpexs/decompiler/flash/gui/graphics/easy32.png new file mode 100644 index 000000000..d8e5f1be8 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/easy32.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties index 452f43a10..7027e8b86 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties @@ -1007,4 +1007,6 @@ menu.file.export.vsCode = Export to VS Code contextmenu.convertShapeType = Convert shape type contextmenu.convertPlaceObjectType = Convert place object type -work.decompiling.allScripts.ucf = Decompiling all scripts to get uninitialized class fields. This may take a while \ No newline at end of file +work.decompiling.allScripts.ucf = Decompiling all scripts to get uninitialized class fields. This may take a while + +menu.file.view.easy = Easy mode \ No newline at end of file