diff options
| author | 2019-05-12 11:04:33 +0200 | |
|---|---|---|
| committer | 2019-05-12 11:04:33 +0200 | |
| commit | 324af846e90ae38886c2298559510aa935b054ee (patch) | |
| tree | ffcb1e64b6108100b6636059a85d3f6034eab83d /src/main/java/cuchaz/enigma/gui/panels | |
| parent | Quick find fixes (#133) (diff) | |
| download | enigma-fork-324af846e90ae38886c2298559510aa935b054ee.tar.gz enigma-fork-324af846e90ae38886c2298559510aa935b054ee.tar.xz enigma-fork-324af846e90ae38886c2298559510aa935b054ee.zip | |
Rename in place functionality (#131)
* Rename in place functionality
* Don't allow rename if renaming is not allowed for the token
* Remove redundant 'R' hotkey
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/panels')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java index f19d98f..849c7c1 100644 --- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java +++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java | |||
| @@ -39,51 +39,57 @@ public class PanelEditor extends JEditorPane { | |||
| 39 | this.addKeyListener(new KeyAdapter() { | 39 | this.addKeyListener(new KeyAdapter() { |
| 40 | @Override | 40 | @Override |
| 41 | public void keyPressed(KeyEvent event) { | 41 | public void keyPressed(KeyEvent event) { |
| 42 | switch (event.getKeyCode()) { | 42 | if (event.isControlDown()) { |
| 43 | case KeyEvent.VK_R: | 43 | switch (event.getKeyCode()) { |
| 44 | gui.popupMenu.renameMenu.doClick(); | 44 | case KeyEvent.VK_I: |
| 45 | break; | 45 | gui.popupMenu.showInheritanceMenu.doClick(); |
| 46 | 46 | break; | |
| 47 | case KeyEvent.VK_I: | ||
| 48 | gui.popupMenu.showInheritanceMenu.doClick(); | ||
| 49 | break; | ||
| 50 | 47 | ||
| 51 | case KeyEvent.VK_M: | 48 | case KeyEvent.VK_M: |
| 52 | gui.popupMenu.showImplementationsMenu.doClick(); | 49 | gui.popupMenu.showImplementationsMenu.doClick(); |
| 53 | break; | 50 | break; |
| 54 | 51 | ||
| 55 | case KeyEvent.VK_N: | 52 | case KeyEvent.VK_N: |
| 56 | gui.popupMenu.openEntryMenu.doClick(); | 53 | gui.popupMenu.openEntryMenu.doClick(); |
| 57 | break; | 54 | break; |
| 58 | 55 | ||
| 59 | case KeyEvent.VK_P: | 56 | case KeyEvent.VK_P: |
| 60 | gui.popupMenu.openPreviousMenu.doClick(); | 57 | gui.popupMenu.openPreviousMenu.doClick(); |
| 61 | break; | 58 | break; |
| 62 | 59 | ||
| 63 | case KeyEvent.VK_E: | 60 | case KeyEvent.VK_E: |
| 64 | gui.popupMenu.openNextMenu.doClick(); | 61 | gui.popupMenu.openNextMenu.doClick(); |
| 65 | break; | 62 | break; |
| 66 | 63 | ||
| 67 | case KeyEvent.VK_C: | 64 | case KeyEvent.VK_C: |
| 68 | gui.popupMenu.showCallsMenu.doClick(); | 65 | gui.popupMenu.showCallsMenu.doClick(); |
| 69 | break; | 66 | break; |
| 70 | 67 | ||
| 71 | case KeyEvent.VK_O: | 68 | case KeyEvent.VK_O: |
| 72 | gui.popupMenu.toggleMappingMenu.doClick(); | 69 | gui.popupMenu.toggleMappingMenu.doClick(); |
| 73 | break; | 70 | break; |
| 74 | case KeyEvent.VK_F5: | 71 | case KeyEvent.VK_F5: |
| 75 | gui.getController().refreshCurrentClass(); | 72 | gui.getController().refreshCurrentClass(); |
| 76 | break; | 73 | break; |
| 77 | default: | 74 | default: |
| 78 | break; | 75 | break; |
| 76 | } | ||
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | gui.setShouldNavigateOnClick(event.isControlDown()); | 79 | gui.setShouldNavigateOnClick(event.isControlDown()); |
| 82 | } | 80 | } |
| 83 | 81 | ||
| 84 | @Override | 82 | @Override |
| 83 | public void keyTyped(KeyEvent event) { | ||
| 84 | if (!gui.popupMenu.renameMenu.isEnabled()) return; | ||
| 85 | if (!event.isControlDown() && !event.isAltDown()) { | ||
| 86 | gui.popupMenu.renameMenu.doClick(); | ||
| 87 | gui.renameTextField.setText(String.valueOf(event.getKeyChar())); | ||
| 88 | } | ||
| 89 | } | ||
| 90 | |||
| 91 | @Override | ||
| 85 | public void keyReleased(KeyEvent event) { | 92 | public void keyReleased(KeyEvent event) { |
| 86 | super.keyReleased(event); | ||
| 87 | gui.setShouldNavigateOnClick(event.isControlDown()); | 93 | gui.setShouldNavigateOnClick(event.isControlDown()); |
| 88 | } | 94 | } |
| 89 | }); | 95 | }); |