From 9af01e7eab242ed6ebcdfc8ce79465c96f4d9237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Wed, 9 Oct 2024 23:34:49 +0200 Subject: [PATCH] Timeline mode term changed to Easy mode and has new icon --- .../decompiler/flash/gui/MainFrameMenu.java | 26 ++++++++-------- .../jpexs/decompiler/flash/gui/MainPanel.java | 28 +++++++++--------- .../decompiler/flash/gui/graphics/easy16.png | Bin 0 -> 831 bytes .../decompiler/flash/gui/graphics/easy32.png | Bin 0 -> 1878 bytes .../flash/gui/locales/MainFrame.properties | 4 ++- 5 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/easy16.png create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/easy32.png 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 0000000000000000000000000000000000000000..fdbb9d5d767569e51a699e85ea85d03fedcbd12d GIT binary patch literal 831 zcmV-F1Hk-=P)(wBl@UIZz9@#8_CeUmDPg}x~k6;w(j38jXZ zmb7Aw(R34&>?WJLyLWf*^xR#Q6%YLH%$+%N=KRn3j|v9>N1z*{ZIS5^{5Qs)4W}3k zeSVXl6xCKu(Qd*7reUHPpT)&c<7*X6H39dOU40tU}I#IUG0fwY_j^Usi z5V^uJWk-avbNF5Mb=6F>(w&TZ)4L=eWYeUfufm8w^%6ap%~Pf(~( z8!n?$37mZ$)Wkn3oKg*Fp}W5|;Za;FW75*EVi8qZraC`IkQFTEC_Y+&l8@e%!nN$L zAJh#P*H!hyp}&IiB;^&^tyL(^W zeVQkndWxBUjyp3&?bjFR_BH6_2apfs<`7T#nB3f}QG4P1b|nqpIQS)Py`SNHl)+t* zW-m^ma#?gKj};yBu{ng*><4g^Z>1$X~Nl;RQ{PD zd-FESlP@V017DuRq)_kbZ1=ps%IYE`uI5pyjfai4e*B}z=y$nhbW5ilipA^$C|`mz zn_;i)?-2Av&+R997e9-i;(ZedvbE_y67IBM{#_B*gE{{TFaXgY6vXpf#S8!d002ov JPDHLkV1h?xgzNwS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d8e5f1be85bbe15cefc510a0feaab7abb436b3a5 GIT binary patch literal 1878 zcmV-c2dVgpP)?}^9S&WuWeJNa|YUTd%YegFO6LTinW@)94` zd*+|SZH~Yf3N8*>8e>pglz@)0;5>qUJ`-Q*p!2_=KKmdlH*Uo*Jr`dRNe0)xNjv( zcM}k&AHb%15%+iw4%!a32!Q|=cWl1wG5!{T@Ht?JYeB^OrCjSASSAP;+BkD^9>;$$ zg(J^Q<4x|Ip|n>bAZ8xI-q8~NL@>{Q8Bm=|`UKYmfB!OzUvCq*LvUR@g8kW(shCUW z#y2)uq%2UHxr8eb@JH+Tv$iv!Wf4YPvkOem;l*8F$G1B%lFsKzz)jDdrChk|eL8nQ zl!MBA4J#2SCIOag7bOE~0GkSPZ_MH7^RMEiM}LD8c>v9sU88;eN&`OoVWeS=axJAd zzgM{i&98bGzO8^S54yOSDK=&k*d6uZcp>y98jAF3xf$u=NYlZuw!MPmt7&{C0&bor z-tyWL9zJ%!!Ly~oVxhik2Z}>u@b_N_>@5IQn&@{tQsvQcg?RQg$W!kj{^JR#nP${* zaKpBvczLZvE>92psE?mkOV*){6MGS?Uk@#Oh>0Tf7K$z~E+|L*jBZ4C4@c0u>2B3Q z^4gn-fAR-(7Uj?DFW~+>23EYR?s#~~!QpDzJG6CjAH2RAqE-UAOF?bW(8ej!P7S7g zAG$z7%vXJyODE{HP6FrJVH6*`9l=QP(1n|DcrA5inSeNKW3p26CN~}UBoukap@#Al ztWW7IBGP=Px_}550ea*)= z5L_dUBxGB{`Lu>;QxXNCjF{q{K(*RXOHIfyf{bGlQb?xq;vdCyzJ~pk-Pr8o=`62S zCScK4cbEGMzTvBTMWK- zNPZEbQv@~y5)vUXv1!0UsNkb4^Ikbj_C?&vH*O~T;F3^l0wZJ%-j#xwDEO1q_Y9;I}xFDTJyPer`X4T z%=_Q2%>pr9pp6??bff_`LBx1qU8P3j(8V2)!5&&DKz+{~oM;|;YKj>XBB3h;$w`v5 zDm94S0oH*Lh=B)zFYZC(`d1$x`rcCyT&Xu06saPr%!}gP3&`2R9&k zn`6NFb5QdQ4u=iM>A%AEm>E3*oLV2OT9u%bviYq*r2i|hs|fW9Vma$A7DptTM4~Xn z{0ECEI6L!;487yu1fI`}K-g6Q&B5Y#fFErHc8>Dq1{OfEhH1%+Y$JDa9=Z#7Jg`Kc zT?2d4HJCcNg$Hsg&r@dB@@Z!0BU^udxTmYftL(ER z9a=Bt^M9Dnls?RuzT4UzWhOUHPHX>OMKLy=l>930M(54-ZLq$ Q1ONa407*qoM6N<$f>Hi