Match TS3's menu layout: Self's away submenu and mic items, bookmarks first, more shortcuts

Self now opens with a Set Away submenu mirroring the toolbar button, then
Activate Microphone and Mute/Unmute items that follow the current state.
The bookmark actions come before the bookmarks. Shortcuts: Ctrl+Q quits,
Ctrl+B manages bookmarks, Ctrl+I opens Identities, Ctrl+Shift+O Contacts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-04 00:04:37 +00:00
co-authored by Claude Opus 5.5
parent 2351b174f8
commit 7c2d4c7c42
3 changed files with 86 additions and 20 deletions
@@ -213,6 +213,11 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
quit(); quit();
} }
@Override
public void onActivate() {
moveMicrophoneToSelectedTab();
}
@Override @Override
public void onToggleMic() { public void onToggleMic() {
toolbar.clickMic(); toolbar.clickMic();
@@ -233,6 +238,11 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
setAwayStatus(); setAwayStatus();
} }
@Override
public JPopupMenu buildAwayMenu() {
return MainFrame.this.buildAwayMenu();
}
@Override @Override
public void onCommanderToggle(boolean commander) { public void onCommanderToggle(boolean commander) {
if (selected != null) selected.session().setCommander(commander); if (selected != null) selected.session().setCommander(commander);
@@ -938,7 +948,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
boolean commander = connected && selected.session().isCommander(); boolean commander = connected && selected.session().isCommander();
toolbar.refresh(connected, anyConnected, micMuted, deaf, active, away); toolbar.refresh(connected, anyConnected, micMuted, deaf, active, away);
toolbar.showHostButton(hostButtonOf(selected)); toolbar.showHostButton(hostButtonOf(selected));
menuBar.refresh(connected, away, commander); menuBar.refresh(connected, anyConnected, micMuted, deaf, active, away, commander);
updateTray(); updateTray();
} }
@@ -14,6 +14,7 @@ import javax.swing.MenuSelectionManager;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.event.MenuEvent; import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener; import javax.swing.event.MenuListener;
import java.awt.Component;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
@@ -34,6 +35,9 @@ final class MainMenuBar extends JMenuBar {
void onQuit(); void onQuit();
/** Moves the microphone to the tab on screen. */
void onActivate();
void onToggleMic(); void onToggleMic();
void onToggleSpeaker(); void onToggleSpeaker();
@@ -43,6 +47,9 @@ final class MainMenuBar extends JMenuBar {
void onAwayStatus(); void onAwayStatus();
/** The away button's drop-down, which the "Set Away" submenu mirrors. */
JPopupMenu buildAwayMenu();
void onCommanderToggle(boolean commander); void onCommanderToggle(boolean commander);
void onChangeNickname(); void onChangeNickname();
@@ -89,6 +96,10 @@ final class MainMenuBar extends JMenuBar {
private final Listener listener; private final Listener listener;
private JMenu bookmarksMenu; private JMenu bookmarksMenu;
private JMenu awayMenu;
private JMenuItem activateItem;
private JMenuItem muteItem;
private JMenuItem deafItem;
private JCheckBoxMenuItem awayItem; private JCheckBoxMenuItem awayItem;
private JMenuItem awayStatusItem; private JMenuItem awayStatusItem;
private JCheckBoxMenuItem commanderItem; private JCheckBoxMenuItem commanderItem;
@@ -112,6 +123,7 @@ final class MainMenuBar extends JMenuBar {
closeTab.setAccelerator(KeyStroke.getKeyStroke("control W")); closeTab.setAccelerator(KeyStroke.getKeyStroke("control W"));
closeTab.addActionListener(e -> listener.onCloseTab()); closeTab.addActionListener(e -> listener.onCloseTab());
JMenuItem quit = new JMenuItem("Quit", Icons.of("QUIT")); JMenuItem quit = new JMenuItem("Quit", Icons.of("QUIT"));
quit.setAccelerator(KeyStroke.getKeyStroke("control Q"));
quit.addActionListener(e -> listener.onQuit()); quit.addActionListener(e -> listener.onQuit());
connections.add(connect); connections.add(connect);
connections.add(disconnect); connections.add(disconnect);
@@ -138,10 +150,29 @@ final class MainMenuBar extends JMenuBar {
}); });
JMenu self = new JMenu("Self"); JMenu self = new JMenu("Self");
JMenuItem mute = new JMenuItem("Toggle microphone", Icons.of("CAPTURE")); awayMenu = new JMenu("Set Away");
mute.addActionListener(e -> listener.onToggleMic()); awayMenu.setIcon(Icons.of("AWAY"));
JMenuItem deaf = new JMenuItem("Toggle speakers", Icons.of("PLAYBACK")); awayMenu.addMenuListener(new MenuListener() {
deaf.addActionListener(e -> listener.onToggleSpeaker()); @Override
public void menuSelected(MenuEvent e) {
rebuildAwayMenu();
}
@Override
public void menuDeselected(MenuEvent e) {
}
@Override
public void menuCanceled(MenuEvent e) {
}
});
activateItem = new JMenuItem("Activate Microphone", Icons.of("ACTIVATE_MICROPHONE"));
activateItem.addActionListener(e -> listener.onActivate());
muteItem = new JMenuItem();
muteItem.addActionListener(e -> listener.onToggleMic());
deafItem = new JMenuItem();
deafItem.addActionListener(e -> listener.onToggleSpeaker());
showMuted(false, false);
awayItem = new JCheckBoxMenuItem("Away", Icons.of("AWAY"), false); awayItem = new JCheckBoxMenuItem("Away", Icons.of("AWAY"), false);
awayItem.addActionListener(e -> listener.onAwayToggle(awayItem.isSelected())); awayItem.addActionListener(e -> listener.onAwayToggle(awayItem.isSelected()));
awayStatusItem = new JMenuItem("Set away status…", Icons.of("EDIT")); awayStatusItem = new JMenuItem("Set away status…", Icons.of("EDIT"));
@@ -154,11 +185,11 @@ final class MainMenuBar extends JMenuBar {
avatarItem.addActionListener(e -> listener.onSetAvatar()); avatarItem.addActionListener(e -> listener.onSetAvatar());
deleteAvatarItem = new JMenuItem("Delete avatar", Icons.of("DELETE_AVATAR")); deleteAvatarItem = new JMenuItem("Delete avatar", Icons.of("DELETE_AVATAR"));
deleteAvatarItem.addActionListener(e -> listener.onDeleteAvatar()); deleteAvatarItem.addActionListener(e -> listener.onDeleteAvatar());
self.add(mute); self.add(awayMenu);
self.add(deaf); self.add(activateItem);
self.add(muteItem);
self.add(deafItem);
self.addSeparator(); self.addSeparator();
self.add(awayItem);
self.add(awayStatusItem);
self.add(commanderItem); self.add(commanderItem);
self.addSeparator(); self.addSeparator();
self.add(nick); self.add(nick);
@@ -204,8 +235,10 @@ final class MainMenuBar extends JMenuBar {
JMenu tools = new JMenu("Tools"); JMenu tools = new JMenu("Tools");
JMenuItem identitiesItem = new JMenuItem("Identities…", Icons.of("IDENTITY_MANAGER")); JMenuItem identitiesItem = new JMenuItem("Identities…", Icons.of("IDENTITY_MANAGER"));
identitiesItem.setAccelerator(KeyStroke.getKeyStroke("control I"));
identitiesItem.addActionListener(e -> listener.onShowIdentities()); identitiesItem.addActionListener(e -> listener.onShowIdentities());
JMenuItem contactsItem = new JMenuItem("Contacts…", Icons.ofAny("CONTACT", "EDIT_FRIEND_FOE_STATUS")); JMenuItem contactsItem = new JMenuItem("Contacts…", Icons.ofAny("CONTACT", "EDIT_FRIEND_FOE_STATUS"));
contactsItem.setAccelerator(KeyStroke.getKeyStroke("control shift O"));
contactsItem.addActionListener(e -> listener.onShowContacts()); contactsItem.addActionListener(e -> listener.onShowContacts());
banListItem = new JMenuItem("Ban List", Icons.of("BAN_LIST")); banListItem = new JMenuItem("Ban List", Icons.of("BAN_LIST"));
banListItem.addActionListener(e -> listener.onShowBanList()); banListItem.addActionListener(e -> listener.onShowBanList());
@@ -250,8 +283,14 @@ final class MainMenuBar extends JMenuBar {
add(help); add(help);
} }
/** Reflects the current tab's away/commander state on the menu items. */ /** Reflects the current tab's state on the menu items. */
void refresh(boolean connected, boolean away, boolean commander) { void refresh(boolean connected, boolean anyConnected, boolean micMuted, boolean deafened,
boolean active, boolean away, boolean commander) {
awayMenu.setEnabled(anyConnected);
activateItem.setEnabled(connected && !active);
muteItem.setEnabled(connected);
deafItem.setEnabled(connected);
showMuted(micMuted, deafened);
awayItem.setEnabled(connected); awayItem.setEnabled(connected);
awayStatusItem.setEnabled(connected); awayStatusItem.setEnabled(connected);
commanderItem.setEnabled(connected); commanderItem.setEnabled(connected);
@@ -264,9 +303,33 @@ final class MainMenuBar extends JMenuBar {
commanderItem.setSelected(commander); commanderItem.setSelected(commander);
} }
private void showMuted(boolean micMuted, boolean deafened) {
muteItem.setText(micMuted ? "Unmute Microphone" : "Mute Microphone");
muteItem.setIcon(Icons.of(micMuted ? "CAPTURE" : "INPUT_MUTED"));
deafItem.setText(deafened ? "Unmute Speakers/Headphones" : "Mute Speakers/Headphones");
deafItem.setIcon(Icons.of(deafened ? "PLAYBACK" : "OUTPUT_MUTED"));
}
/** The toolbar button's toggle and status for this server, then its drop-down's global items. */
private void rebuildAwayMenu() {
awayMenu.removeAll();
awayMenu.add(awayItem);
awayMenu.add(awayStatusItem);
awayMenu.addSeparator();
for (Component c : listener.buildAwayMenu().getComponents()) awayMenu.getPopupMenu().add(c);
}
/** Re-lists the saved bookmarks; called after they change (add, remove, manage…). */ /** Re-lists the saved bookmarks; called after they change (add, remove, manage…). */
void rebuildBookmarks() { void rebuildBookmarks() {
bookmarksMenu.removeAll(); bookmarksMenu.removeAll();
JMenuItem addCurrent = new JMenuItem("Add to Bookmarks…", Icons.of("BOOKMARK_ADD"));
addCurrent.addActionListener(e -> listener.onAddCurrentServerBookmark());
JMenuItem manage = new JMenuItem("Manage Bookmarks…", Icons.of("BOOKMARK_MANAGER"));
manage.setAccelerator(KeyStroke.getKeyStroke("control B"));
manage.addActionListener(e -> listener.onManageBookmarks());
bookmarksMenu.add(addCurrent);
bookmarksMenu.add(manage);
if (!bookmarks.all().isEmpty()) bookmarksMenu.addSeparator();
for (Bookmark b : bookmarks.all()) { for (Bookmark b : bookmarks.all()) {
ImageIcon serverIcon = GroupIcons.cached(b.iconId); ImageIcon serverIcon = GroupIcons.cached(b.iconId);
JMenuItem item = new JMenuItem(b.displayName(), serverIcon != null ? serverIcon : Icons.of("SERVER_GREEN")); JMenuItem item = new JMenuItem(b.displayName(), serverIcon != null ? serverIcon : Icons.of("SERVER_GREEN"));
@@ -282,12 +345,5 @@ final class MainMenuBar extends JMenuBar {
}); });
bookmarksMenu.add(item); bookmarksMenu.add(item);
} }
if (!bookmarks.all().isEmpty()) bookmarksMenu.addSeparator();
JMenuItem addCurrent = new JMenuItem("Add current server…", Icons.of("BOOKMARK_ADD"));
addCurrent.addActionListener(e -> listener.onAddCurrentServerBookmark());
JMenuItem manage = new JMenuItem("Manage bookmarks…", Icons.of("BOOKMARK_MANAGER"));
manage.addActionListener(e -> listener.onManageBookmarks());
bookmarksMenu.add(addCurrent);
bookmarksMenu.add(manage);
} }
} }
@@ -151,12 +151,12 @@ final class MainToolbar extends JToolBar {
awayButton.setSelected(away); awayButton.setSelected(away);
} }
/** Simulates a click, for the "Toggle microphone" menu item. */ /** Simulates a click, for the "Mute Microphone" menu item. */
void clickMic() { void clickMic() {
micButton.doClick(); micButton.doClick();
} }
/** Simulates a click, for the "Toggle speakers" menu item. */ /** Simulates a click, for the "Mute Speakers/Headphones" menu item. */
void clickSpeaker() { void clickSpeaker() {
speakerButton.doClick(); speakerButton.doClick();
} }