Add Request Talk Power and Set Phonetic Nickname to the Self menu
A request asks for a reason, as TS3 does, and turns the item into Cancel Talk Power Request until it is granted or withdrawn. The phonetic nickname applies to the current server. client_talk_request carries the request's timestamp, so any non-zero value now counts as a pending request. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -253,6 +253,21 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
|
||||
changeNickname();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTalkPowerRequested() {
|
||||
return selected != null && selected.session().isTalkRequested();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestTalkPower() {
|
||||
requestTalkPower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSetPhoneticNickname() {
|
||||
setPhoneticNickname();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canSetAvatar() {
|
||||
return selected != null && selected.session().canSetAvatar();
|
||||
@@ -925,6 +940,26 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
|
||||
}
|
||||
}
|
||||
|
||||
/** Asks for a reason and requests talk power, or withdraws the pending request. */
|
||||
private void requestTalkPower() {
|
||||
if (selected == null) return;
|
||||
if (selected.session().isTalkRequested()) {
|
||||
selected.session().cancelTalkRequest();
|
||||
return;
|
||||
}
|
||||
String message = (String) JOptionPane.showInputDialog(this, "Reason:", "Request Talk Power",
|
||||
JOptionPane.PLAIN_MESSAGE, Icons.of("TALK_POWER_REQUEST"), null, "");
|
||||
if (message != null) selected.session().requestTalkPower(message.trim());
|
||||
}
|
||||
|
||||
private void setPhoneticNickname() {
|
||||
if (selected == null) return;
|
||||
String phonetic = (String) JOptionPane.showInputDialog(this, "Phonetic nickname:", "Set Phonetic Nickname",
|
||||
JOptionPane.PLAIN_MESSAGE, Icons.of("PHONETICSNICKNAME"), null,
|
||||
selected.session().phoneticNickname());
|
||||
if (phonetic != null) selected.session().setPhoneticNickname(phonetic.trim());
|
||||
}
|
||||
|
||||
private void showAbout() {
|
||||
JOptionPane.showMessageDialog(this,
|
||||
"TS3J Swing Client\n\n" +
|
||||
|
||||
@@ -54,6 +54,14 @@ final class MainMenuBar extends JMenuBar {
|
||||
|
||||
void onChangeNickname();
|
||||
|
||||
/** Whether our talk power request is pending; asked as the Self menu opens. */
|
||||
boolean isTalkPowerRequested();
|
||||
|
||||
/** Requests talk power, or withdraws a pending request. */
|
||||
void onRequestTalkPower();
|
||||
|
||||
void onSetPhoneticNickname();
|
||||
|
||||
/** Whether the current server lets us upload an avatar; asked as the Self menu opens. */
|
||||
boolean canSetAvatar();
|
||||
|
||||
@@ -103,6 +111,8 @@ final class MainMenuBar extends JMenuBar {
|
||||
private JCheckBoxMenuItem awayItem;
|
||||
private JMenuItem awayStatusItem;
|
||||
private JCheckBoxMenuItem commanderItem;
|
||||
private JMenuItem talkPowerItem;
|
||||
private JMenuItem phoneticItem;
|
||||
private JMenuItem avatarItem;
|
||||
private JMenuItem deleteAvatarItem;
|
||||
private JMenuItem banListItem;
|
||||
@@ -181,6 +191,11 @@ final class MainMenuBar extends JMenuBar {
|
||||
commanderItem.addActionListener(e -> listener.onCommanderToggle(commanderItem.isSelected()));
|
||||
JMenuItem nick = new JMenuItem("Change nickname…", Icons.of("CHANGE_NICKNAME"));
|
||||
nick.addActionListener(e -> listener.onChangeNickname());
|
||||
talkPowerItem = new JMenuItem();
|
||||
talkPowerItem.addActionListener(e -> listener.onRequestTalkPower());
|
||||
showTalkPowerRequested(false);
|
||||
phoneticItem = new JMenuItem("Set Phonetic Nickname…", Icons.of("PHONETICSNICKNAME"));
|
||||
phoneticItem.addActionListener(e -> listener.onSetPhoneticNickname());
|
||||
avatarItem = new JMenuItem("Set avatar…", Icons.of("UPLOAD_AVATAR"));
|
||||
avatarItem.addActionListener(e -> listener.onSetAvatar());
|
||||
deleteAvatarItem = new JMenuItem("Delete avatar", Icons.of("DELETE_AVATAR"));
|
||||
@@ -193,11 +208,14 @@ final class MainMenuBar extends JMenuBar {
|
||||
self.add(commanderItem);
|
||||
self.addSeparator();
|
||||
self.add(nick);
|
||||
self.add(talkPowerItem);
|
||||
self.add(phoneticItem);
|
||||
self.add(avatarItem);
|
||||
self.add(deleteAvatarItem);
|
||||
self.addMenuListener(new MenuListener() {
|
||||
@Override
|
||||
public void menuSelected(MenuEvent e) {
|
||||
showTalkPowerRequested(listener.isTalkPowerRequested());
|
||||
avatarItem.setVisible(!avatarItem.isEnabled() || listener.canSetAvatar());
|
||||
deleteAvatarItem.setVisible(listener.hasAvatar());
|
||||
}
|
||||
@@ -294,6 +312,8 @@ final class MainMenuBar extends JMenuBar {
|
||||
awayItem.setEnabled(connected);
|
||||
awayStatusItem.setEnabled(connected);
|
||||
commanderItem.setEnabled(connected);
|
||||
talkPowerItem.setEnabled(connected);
|
||||
phoneticItem.setEnabled(connected);
|
||||
avatarItem.setEnabled(connected);
|
||||
deleteAvatarItem.setEnabled(connected);
|
||||
banListItem.setEnabled(connected);
|
||||
@@ -303,6 +323,11 @@ final class MainMenuBar extends JMenuBar {
|
||||
commanderItem.setSelected(commander);
|
||||
}
|
||||
|
||||
private void showTalkPowerRequested(boolean requested) {
|
||||
talkPowerItem.setText(requested ? "Cancel Talk Power Request" : "Request Talk Power…");
|
||||
talkPowerItem.setIcon(Icons.of(requested ? "TALK_POWER_CANCEL_REQUEST" : "TALK_POWER_REQUEST"));
|
||||
}
|
||||
|
||||
private void showMuted(boolean micMuted, boolean deafened) {
|
||||
muteItem.setText(micMuted ? "Unmute Microphone" : "Mute Microphone");
|
||||
muteItem.setIcon(Icons.of(micMuted ? "CAPTURE" : "INPUT_MUTED"));
|
||||
|
||||
Reference in New Issue
Block a user