Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File chooser parent hotkey #7130

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −1
Draft

File chooser parent hotkey #7130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593cbd8
attempt at implementing #7129
hippietrail Oct 31, 2024
973fa13
cleaner code
hippietrail Oct 31, 2024
2194515
Merge branch 'NationalSecurityAgency:master' into file-chooser-parent…
hippietrail Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ public void keyReleased(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
e.consume();
handleEnterKey();
} else if (e.getKeyCode() == KeyEvent.VK_UP) {
if (e.getModifiersEx() == KeyEvent.META_DOWN_MASK) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a utility for checking this in a system independent fashion:

DockingUtils.CONTROL_KEY_MODIFIER_MASK

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've noticed that if I start Ghidra and go straight to import that the key doesn't work, but if I click anywhere in the dialog or do almost anything with it first then it does work.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that goes back to where the key listener is installed. The way it is written here, the focus has to be in the list of files for it to work. The correct solution would require a change in how and where the key listener is added. This starts to become black diamond skiing for Swing changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way it is written here, the focus has to be in the list of files for it to work. The correct solution would require a change in how and where the key listener is added.

Yes I looked around and then first put the listener somewhere else where it worked sometimes and then noticed key events were mostly getting heard in the DirectoryList...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a more subtle Swing mechanism for adding actions to containers. These actions can have key bindings mapped to them. In this scenario, the event would propagate from different focused widgets up to the main dialog container, who would then handle the event. We also have Ghidra actions that can be installed, which are a bit easier to use than Java's.

I plan on taking a look into this in order to find the best solution.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I was going to add hotkeys for forward and back, which would be no harder, and then down, which would be a little harder since it depends on a directory being currently selected.

e.consume();
chooser.goUpOneDirectoryLevel();
}
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ private boolean isUserEditing() {
return false;
}

private void goUpOneDirectoryLevel() {
public void goUpOneDirectoryLevel() {
cancelEdits();

if (currentDirectory() == null) {
Expand Down