From ee1a83e98129361359f8c65cb6bb2315595c0795 Mon Sep 17 00:00:00 2001 From: ericek111 Date: Sun, 4 Oct 2026 00:11:15 +0000 Subject: [PATCH] Add shortcuts for Disconnect, Ban List and Options Ctrl+D disconnects from the current server, Ctrl+Shift+B opens the ban list (only where it may be viewed) and Alt+P the options. Co-Authored-By: Claude Opus 5.5 --- .../swing/src/main/java/com/ts3client/ui/MainMenuBar.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ts3-client/swing/src/main/java/com/ts3client/ui/MainMenuBar.java b/ts3-client/swing/src/main/java/com/ts3client/ui/MainMenuBar.java index 896adb8..a98fa09 100644 --- a/ts3-client/swing/src/main/java/com/ts3client/ui/MainMenuBar.java +++ b/ts3-client/swing/src/main/java/com/ts3client/ui/MainMenuBar.java @@ -128,6 +128,7 @@ final class MainMenuBar extends JMenuBar { connect.setAccelerator(KeyStroke.getKeyStroke("control S")); connect.addActionListener(e -> listener.onConnect()); JMenuItem disconnect = new JMenuItem("Disconnect", Icons.of("DISCONNECT")); + disconnect.setAccelerator(KeyStroke.getKeyStroke("control D")); disconnect.addActionListener(e -> listener.onDisconnect()); JMenuItem closeTab = new JMenuItem("Close tab", Icons.of("CLOSE_BUTTON")); closeTab.setAccelerator(KeyStroke.getKeyStroke("control W")); @@ -259,8 +260,13 @@ final class MainMenuBar extends JMenuBar { contactsItem.setAccelerator(KeyStroke.getKeyStroke("control shift O")); contactsItem.addActionListener(e -> listener.onShowContacts()); banListItem = new JMenuItem("Ban List", Icons.of("BAN_LIST")); - banListItem.addActionListener(e -> listener.onShowBanList()); + banListItem.setAccelerator(KeyStroke.getKeyStroke("control shift B")); + // The shortcut works while the item is hidden, so it asks for itself. + banListItem.addActionListener(e -> { + if (listener.canViewBanList()) listener.onShowBanList(); + }); JMenuItem options = new JMenuItem("Options…", Icons.of("SETTINGS")); + options.setAccelerator(KeyStroke.getKeyStroke("alt P")); options.addActionListener(e -> listener.onShowSettings()); JPopupMenu.Separator banListSeparator = new JPopupMenu.Separator(); tools.add(identitiesItem);