Skip to content

Commit 5c22188

Browse files
committed
Better plugin integration
1 parent 0f77885 commit 5c22188

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/java/club/bytecode/the/jda/JDA.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public static void main(String[] args) {
8383
recentFiles.addAll(FileUtils.readLines(recentsFile, "UTF-8"));
8484

8585
viewer = new MainViewerGUI();
86+
JDA.onGUILoad();
8687
Boot.boot();
8788
JDA.boot(args);
8889
} catch (Exception e) {
@@ -213,7 +214,7 @@ public static void setBusy(boolean busy) {
213214
else
214215
jobCount.decrementAndGet();
215216
assert (jobCount.get() >= 0);
216-
viewer.setIcon(busy);
217+
viewer.setIcon(jobCount.get() > 0);
217218
}
218219

219220
public static byte[] getFileBytes(ViewerFile file) {

src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ public class MainViewerGUI extends JFrame implements IPersistentWindow {
4040
public final ButtonGroup[] panelGroups = new ButtonGroup[NUM_PANEL_GROUPS];
4141

4242
public JMenuBar menuBar;
43-
public JMenu viewMenu;
4443
public JMenu fileMenu;
45-
public JMenu windowMenu;
4644
public JMenu editMenu;
45+
public JMenu searchMenu;
46+
public JMenu viewMenu;
47+
public JMenu windowMenu;
4748
public JMenu optionsMenu;
4849
public JMenu helpMenu;
49-
public JMenu pluginsMenu;
5050

5151
public boolean isMaximized = false;
5252
public Point unmaximizedPos;
@@ -66,6 +66,7 @@ public class MainViewerGUI extends JFrame implements IPersistentWindow {
6666
private JMenuItem spinnerMenu = new JMenuItem("");
6767
public FontOptionsDialog fontOptionsDialog = new FontOptionsDialog();
6868

69+
6970
public MainViewerGUI() {
7071
initializeWindows();
7172

@@ -132,8 +133,6 @@ public void componentMoved(ComponentEvent e) {
132133
unmaximizedPos = getLocation();
133134

134135
this.setLocationRelativeTo(null);
135-
136-
JDA.onGUILoad();
137136
}
138137

139138
private void initializeMenubar() {
@@ -221,7 +220,7 @@ private void initializeMenubar() {
221220

222221
// -------------------------------------------------------------------------------------------
223222
// Plugins menu
224-
pluginsMenu = new JMenu("Plugins");
223+
JMenu pluginsMenu = new JMenu("Plugins");
225224
editMenu.add(pluginsMenu);
226225
for (JDAPlugin plugin : JDA.getLoadedPlugins()) {
227226
JMenuItem button = new JMenuItem(plugin.getName());
@@ -232,9 +231,9 @@ private void initializeMenubar() {
232231
// ===========================================================================================
233232
// Search menu
234233
// ===========================================================================================
235-
JMenu searchMenu = new JMenu("Search");
234+
searchMenu = new JMenu("Search");
236235
editMenu.add(searchMenu);
237-
JMenuItem constantButton = new JMenuItem("Raw constant");
236+
JMenuItem constantButton = new JMenuItem("Binary constant");
238237
constantButton.addActionListener((e) -> doSearchDialog());
239238
searchMenu.add(constantButton);
240239
menuBar.add(searchMenu);

0 commit comments

Comments
 (0)