Skip to content

Commit 34b2dee

Browse files
committed
Add menu item and hotkey for constantpool search
1 parent 6499529 commit 34b2dee

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ public static void checkHotKey(KeyEvent e) {
542542
} else if ((e.getKeyCode() == KeyEvent.VK_W) && isCtrlDown(e)) {
543543
if (viewer.fileViewerPane.getCurrentViewer() != null)
544544
viewer.fileViewerPane.tabs.remove(viewer.fileViewerPane.getCurrentViewer());
545+
} else if ((e.getKeyCode() == KeyEvent.VK_F) && isCtrlDown(e) && isShiftDown(e)) {
546+
viewer.doSearchDialog();
545547
}
546548
}
547549

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import club.bytecode.the.jda.gui.fileviewer.Viewer;
1515
import club.bytecode.the.jda.gui.fileviewer.ViewerFile;
1616
import club.bytecode.the.jda.gui.navigation.FileNavigationPane;
17+
import club.bytecode.the.jda.gui.search.SearchDialog;
1718
import club.bytecode.the.jda.settings.IPersistentWindow;
1819
import club.bytecode.the.jda.settings.Settings;
1920

@@ -215,7 +216,7 @@ private void initializeMenubar() {
215216
// Edit menu
216217
// ===========================================================================================
217218
menuBar.add(editMenu);
218-
219+
219220
// -------------------------------------------------------------------------------------------
220221
// Settings menu
221222
settingsMenu = new JMenu("Settings");
@@ -250,6 +251,15 @@ private void initializeMenubar() {
250251
button.addActionListener((e) -> plugin.onPluginButton());
251252
pluginsMenu.add(button);
252253
}
254+
255+
// -------------------------------------------------------------------------------------------
256+
// Search menu
257+
JMenu searchMenu = new JMenu("Search...");
258+
editMenu.add(searchMenu);
259+
JMenuItem constantButton = new JMenuItem("Raw constant");
260+
constantButton.addActionListener((e) -> doSearchDialog());
261+
searchMenu.add(constantButton);
262+
253263

254264
// ===========================================================================================
255265
// View menu
@@ -316,7 +326,13 @@ private void initializeMenubar() {
316326
// ===========================================================================================
317327
menuBar.add(spinnerMenu);
318328
}
319-
329+
330+
public void doSearchDialog() {
331+
String constant = JOptionPane.showInputDialog("Enter a constant...");
332+
if (constant != null && !constant.isEmpty())
333+
new SearchDialog(constant, JDA.search(constant)).setVisible(true);
334+
}
335+
320336
private void initializePanelGroup() {
321337
for (int i = 0; i < panelGroups.length; i++) {
322338
String decompilerName = Settings.PANE_DECOMPILERS[i].getString();

src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class FileViewerPane extends JDAWindow {
3535
List<ViewerFile> workingOn = new IndexedList<>();
3636

3737
public FileViewerPane() {
38-
super("WorkPanel", "Work Space", Resources.fileNavigatorIcon);
38+
super("WorkPanel", "File Viewer", Resources.fileNavigatorIcon);
3939

4040
this.tabs = new JTabbedPane();
4141

src/main/resources/club/bytecode/the/jda/html/intro.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ <h2>Keyboard Short-cuts:</h2>
2929
<li>Reload Resources (Ctrl + Shift + R)</li>
3030
<li>Refresh View [Redecompile] (Ctrl + R)</li>
3131
<li>Close All Resources (Ctrl + Shift + W)</li>
32-
<li>Search Text (Ctrl + F)</li>
33-
<li>Search For File (Ctrl + F)</li>
32+
<li>File Viewer: Search Text (Ctrl + F)</li>
33+
<li>Navigator: Search For File (Ctrl + F)</li>
34+
<li>Search All Files (Ctrl + Shift + F)</li>
3435
<li>Close Current Tab (Ctrl + W)</li>
3536
</ul>
3637

0 commit comments

Comments
 (0)