refactor - SHIFT and CTRL masks

This commit is contained in:
rdavidek 2026-01-27 23:23:28 +01:00
parent 93b100e69a
commit a6ff049a65
2 changed files with 3 additions and 8 deletions

View File

@ -1747,21 +1747,21 @@ public class FilePanelTab extends JPanel {
// Cut // Cut
JMenuItem cutItem = new JMenuItem("Cut"); JMenuItem cutItem = new JMenuItem("Cut");
cutItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.CTRL_MASK)); cutItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_DOWN_MASK));
setMenuItemEnabled(cutItem, !isParentDir); setMenuItemEnabled(cutItem, !isParentDir);
cutItem.addActionListener(ae -> copyToClipboard(true)); cutItem.addActionListener(ae -> copyToClipboard(true));
menu.add(cutItem); menu.add(cutItem);
// Copy // Copy
JMenuItem copyItem = new JMenuItem("Copy"); JMenuItem copyItem = new JMenuItem("Copy");
copyItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.CTRL_MASK)); copyItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK));
setMenuItemEnabled(copyItem, !isParentDir); setMenuItemEnabled(copyItem, !isParentDir);
copyItem.addActionListener(ae -> copyToClipboard(false)); copyItem.addActionListener(ae -> copyToClipboard(false));
menu.add(copyItem); menu.add(copyItem);
// Paste // Paste
JMenuItem pasteItem = new JMenuItem("Paste"); JMenuItem pasteItem = new JMenuItem("Paste");
pasteItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, ActionEvent.CTRL_MASK)); pasteItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK));
setMenuItemEnabled(pasteItem, hasClipboardFiles); setMenuItemEnabled(pasteItem, hasClipboardFiles);
pasteItem.addActionListener(ae -> pasteFromClipboard()); pasteItem.addActionListener(ae -> pasteFromClipboard());
menu.add(pasteItem); menu.add(pasteItem);

View File

@ -1227,9 +1227,6 @@ public class MainWindow extends JFrame {
rootPane.registerKeyboardAction(e -> deleteFiles(), rootPane.registerKeyboardAction(e -> deleteFiles(),
KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_DOWN_MASK), KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_DOWN_MASK),
JComponent.WHEN_IN_FOCUSED_WINDOW); JComponent.WHEN_IN_FOCUSED_WINDOW);
rootPane.registerKeyboardAction(e -> deleteFiles(),
KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_MASK),
JComponent.WHEN_IN_FOCUSED_WINDOW);
// No direct F9 keyboard binding: inline rename should only be triggered by Shift+F6 // No direct F9 keyboard binding: inline rename should only be triggered by Shift+F6
@ -1456,8 +1453,6 @@ public class MainWindow extends JFrame {
// Also map Shift+Delete on table level // Also map Shift+Delete on table level
table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_DOWN_MASK), "deleteFiles"); .put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_DOWN_MASK), "deleteFiles");
table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.SHIFT_MASK), "deleteFiles");
// Clipboard support (Ctrl+C, Ctrl+X, Ctrl+V) // Clipboard support (Ctrl+C, Ctrl+X, Ctrl+V)
table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)