From 7e794ffffec29cdfa95c3114ba64a6fbcf64dbec Mon Sep 17 00:00:00 2001 From: ericek111 Date: Wed, 14 Oct 2026 18:34:12 +0000 Subject: [PATCH] Swing ui package split by feature Co-Authored-By: Claude Opus 5.5 --- ts3-client/AUDIT-STRUCTURE.md | 8 +-- .../main/java/eu/lixko/ts3j/client/Main.java | 2 +- .../eu/lixko/ts3j/client/ui/DesktopEntry.java | 1 + .../lixko/ts3j/client/ui/DesktopNotifier.java | 9 +-- .../lixko/ts3j/client/ui/HostButtonView.java | 3 + .../ts3j/client/ui/LookAndFeelManager.java | 1 + .../eu/lixko/ts3j/client/ui/MainCommands.java | 52 +++++++------- .../eu/lixko/ts3j/client/ui/MainFrame.java | 67 +++++++++++-------- .../eu/lixko/ts3j/client/ui/MainMenuBar.java | 2 + .../eu/lixko/ts3j/client/ui/MainToolbar.java | 2 + .../lixko/ts3j/client/ui/ServerTabPane.java | 2 + .../eu/lixko/ts3j/client/ui/StatusBar.java | 1 + .../lixko/ts3j/client/ui/TabDragReorder.java | 8 +-- .../lixko/ts3j/client/ui/TrayController.java | 1 + .../{ => admin}/AbstractServerListDialog.java | 12 ++-- .../client/ui/{ => admin}/BanAddDialog.java | 3 +- .../ts3j/client/ui/{ => admin}/BanDialog.java | 13 ++-- .../ui/{ => admin}/BanDurationPicker.java | 2 +- .../client/ui/{ => admin}/BanListDialog.java | 10 +-- .../ui/{ => admin}/ComplaintsDialog.java | 7 +- .../OfflineMessageComposeDialog.java | 11 +-- .../ui/{ => admin}/OfflineMessagesDialog.java | 14 ++-- .../{ => admin}/PrivilegeKeyCreateDialog.java | 7 +- .../ui/{ => admin}/PrivilegeKeysDialog.java | 8 ++- .../client/ui/{ => admin}/ReasonDialog.java | 8 +-- .../ui/{ => admin}/ServerGroupsDialog.java | 12 ++-- .../ui/{ => admin}/ServerLogDialog.java | 12 ++-- .../{ => admin}/ServerLogExcludeDialog.java | 4 +- .../{ => admin}/ServerLogHighlightDialog.java | 4 +- .../{ => channel}/ChannelAdvancedPanel.java | 2 +- .../ui/{ => channel}/ChannelAudioPanel.java | 2 +- .../ui/{ => channel}/ChannelDialog.java | 11 +-- .../ChannelPermissionsPanel.java | 3 +- .../{ => channel}/ChannelStandardPanel.java | 2 +- .../DescriptionEditorDialog.java | 4 +- .../ui/{ => channel}/IconChooserDialog.java | 9 ++- .../client/ui/{ => channel}/Spinners.java | 2 +- .../{ => chat}/AttachmentTransferHandler.java | 2 +- .../ts3j/client/ui/{ => chat}/AvatarHtml.java | 12 ++-- .../ui/{ => chat}/ChatAttachmentActions.java | 7 +- .../ts3j/client/ui/{ => chat}/ChatPanel.java | 5 +- .../ts3j/client/ui/{ => chat}/ChatSearch.java | 16 +++-- .../ui/{ => chat}/DescriptionPictures.java | 13 ++-- .../ts3j/client/ui/{ => chat}/HtmlStyles.java | 11 +-- .../ts3j/client/ui/{ => chat}/Links.java | 8 +-- .../client/ui/{ => chat}/PictureViewer.java | 2 +- .../ts3j/client/ui/{ => chat}/TextZoom.java | 8 +-- .../client/ui/{ => hotkey}/HotkeyActions.java | 8 ++- .../ui/{ => hotkey}/HotkeyArguments.java | 4 +- .../client/ui/{ => hotkey}/HotkeyDialog.java | 11 +-- .../client/ui/{ => hotkey}/HotkeyService.java | 20 +++--- .../client/ui/{ => hotkey}/HotkeysPanel.java | 10 +-- .../ui/{ => icons}/CountryFlagIcons.java | 6 +- .../client/ui/{ => icons}/GroupIcons.java | 2 +- .../ts3j/client/ui/{ => icons}/IconFiles.java | 8 +-- .../ts3j/client/ui/{ => icons}/IconTheme.java | 2 +- .../ts3j/client/ui/{ => icons}/Icons.java | 3 +- .../AbstractListEditorDialog.java | 9 ++- .../ui/{ => manage}/AwayMessagesDialog.java | 3 +- .../ui/{ => manage}/BookmarksDialog.java | 5 +- .../client/ui/{ => manage}/ConnectDialog.java | 3 +- .../{ => manage}/ContactDefaultsDialog.java | 8 ++- .../ui/{ => manage}/ContactsDialog.java | 11 +-- .../ui/{ => manage}/IdentitiesDialog.java | 3 +- .../ui/{ => manage}/IdentityChooser.java | 2 +- .../ui/{ => options}/ApplicationPanel.java | 3 +- .../client/ui/{ => options}/AudioDevices.java | 2 +- .../client/ui/{ => options}/CapturePanel.java | 5 +- .../ui/{ => options}/ChatLogsPanel.java | 3 +- .../ui/{ => options}/ClientVersionPanel.java | 2 +- .../ui/{ => options}/ContactsPanel.java | 4 +- .../client/ui/{ => options}/DesignPanel.java | 7 +- .../client/ui/{ => options}/LevelMeter.java | 3 +- .../ui/{ => options}/MicrophoneTest.java | 2 +- .../ui/{ => options}/MyTeamSpeakPanel.java | 7 +- .../client/ui/{ => options}/NetworkPanel.java | 3 +- .../ui/{ => options}/NotificationsPanel.java | 2 +- .../client/ui/{ => options}/OptionsPage.java | 4 +- .../ui/{ => options}/OptionsSidebar.java | 2 +- .../ui/{ => options}/PlaybackPanel.java | 3 +- .../ui/{ => options}/RowColorCombo.java | 2 +- .../ui/{ => options}/SettingsDialog.java | 6 +- .../{ => options}/VoiceActivationSection.java | 7 +- .../client/ui/{ => server}/AvatarActions.java | 11 +-- .../client/ui/{ => server}/ChannelMenu.java | 3 +- .../client/ui/{ => server}/ClientMenu.java | 4 +- .../ui/{ => server}/ClientSelectionModel.java | 2 +- .../ui/{ => server}/ClientVolumeDialog.java | 6 +- .../ui/{ => server}/ConnectionInfoDialog.java | 10 ++- .../ui/{ => server}/DropIndicatorTree.java | 8 ++- .../ui/{ => server}/FileBrowserDialog.java | 6 +- .../client/ui/{ => server}/InfoPanel.java | 10 ++- .../ui/{ => server}/NicknameCellEditor.java | 3 +- .../ui/{ => server}/RecordingActions.java | 10 +-- .../client/ui/{ => server}/ServerMenu.java | 3 +- .../client/ui/{ => server}/ServerTab.java | 44 +++++++----- .../ServerTabConnectionEvents.java | 4 +- .../ui/{ => server}/ServerTabTreeActions.java | 15 ++++- .../{ => server}/ServerTreeCellRenderer.java | 6 +- .../{ => server}/ServerTreeDragAndDrop.java | 2 +- .../ui/{ => server}/ServerTreePanel.java | 6 +- .../ui/{ => server}/ServerTreeSearch.java | 4 +- .../ts3j/client/ui/{ => widget}/Dialogs.java | 8 +-- .../ui/{ => widget}/DropDownToggleButton.java | 2 +- .../ts3j/client/ui/{ => widget}/Edt.java | 10 +-- .../ts3j/client/ui/{ => widget}/FindBar.java | 31 ++++----- .../client/ui/{ => widget}/FormPanel.java | 30 ++++----- .../client/ui/{ => widget}/SplitRatio.java | 6 +- .../client/ui/{ => icons}/app-icon-small.svg | 0 .../ts3j/client/ui/{ => icons}/app-icon.svg | 0 .../ui/{ => options}/MicrophoneTestTest.java | 2 +- ts3-client/tools/AppIcon.java | 2 +- 112 files changed, 513 insertions(+), 325 deletions(-) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/AbstractServerListDialog.java (95%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/BanAddDialog.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/BanDialog.java (89%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/BanDurationPicker.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/BanListDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ComplaintsDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/OfflineMessageComposeDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/OfflineMessagesDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/PrivilegeKeyCreateDialog.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/PrivilegeKeysDialog.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ReasonDialog.java (93%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ServerGroupsDialog.java (90%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ServerLogDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ServerLogExcludeDialog.java (87%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => admin}/ServerLogHighlightDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/ChannelAdvancedPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/ChannelAudioPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/ChannelDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/ChannelPermissionsPanel.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/ChannelStandardPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/DescriptionEditorDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/IconChooserDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => channel}/Spinners.java (95%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/AttachmentTransferHandler.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/AvatarHtml.java (88%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/ChatAttachmentActions.java (94%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/ChatPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/ChatSearch.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/DescriptionPictures.java (94%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/HtmlStyles.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/Links.java (86%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/PictureViewer.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => chat}/TextZoom.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => hotkey}/HotkeyActions.java (95%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => hotkey}/HotkeyArguments.java (86%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => hotkey}/HotkeyDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => hotkey}/HotkeyService.java (87%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => hotkey}/HotkeysPanel.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => icons}/CountryFlagIcons.java (91%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => icons}/GroupIcons.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => icons}/IconFiles.java (93%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => icons}/IconTheme.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => icons}/Icons.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/AbstractListEditorDialog.java (94%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/AwayMessagesDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/BookmarksDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/ConnectDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/ContactDefaultsDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/ContactsDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/IdentitiesDialog.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => manage}/IdentityChooser.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/ApplicationPanel.java (92%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/AudioDevices.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/CapturePanel.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/ChatLogsPanel.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/ClientVersionPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/ContactsPanel.java (95%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/DesignPanel.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/LevelMeter.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/MicrophoneTest.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/MyTeamSpeakPanel.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/NetworkPanel.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/NotificationsPanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/OptionsPage.java (89%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/OptionsSidebar.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/PlaybackPanel.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/RowColorCombo.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/SettingsDialog.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => options}/VoiceActivationSection.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/AvatarActions.java (94%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ChannelMenu.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ClientMenu.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ClientSelectionModel.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ClientVolumeDialog.java (93%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ConnectionInfoDialog.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/DropIndicatorTree.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/FileBrowserDialog.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/InfoPanel.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/NicknameCellEditor.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/RecordingActions.java (87%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerMenu.java (91%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTab.java (89%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTabConnectionEvents.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTabTreeActions.java (96%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTreeCellRenderer.java (97%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTreeDragAndDrop.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTreePanel.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => server}/ServerTreeSearch.java (98%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/Dialogs.java (86%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/DropDownToggleButton.java (99%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/Edt.java (57%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/FindBar.java (95%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/FormPanel.java (85%) rename ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/{ => widget}/SplitRatio.java (93%) rename ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/{ => icons}/app-icon-small.svg (100%) rename ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/{ => icons}/app-icon.svg (100%) rename ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/{ => options}/MicrophoneTestTest.java (97%) diff --git a/ts3-client/AUDIT-STRUCTURE.md b/ts3-client/AUDIT-STRUCTURE.md index 5d0d999..e3cf2d1 100644 --- a/ts3-client/AUDIT-STRUCTURE.md +++ b/ts3-client/AUDIT-STRUCTURE.md @@ -25,9 +25,9 @@ Items are worked through in the order below. Status: open, done (commit), or clo | 9b | … "which chat" enums | done (`5358599`): one `chat.ChatScope` replaces `ConnectionListener.ChatScope`, `ChatLogScope` and `ChatPanel.Target`, and the mappings between them are gone. Android's `ChatKey` also carries the peer, so it goes with the conversation model | | 9c | … the conversation model (Swing `ChatPanel.Tab`, Android `Chats`) | done (`a2a1280`): `session.ChatFeed` decides which conversation a message, history or server event goes to and renders it, and the frontends get the lines through `chat.ChatSink` (`ServerSession.Listener` no longer passes on raw chat events). `chat.ChatKey` replaces Android's own key and `ChatPanel`'s scope and client id. Each frontend still keeps and draws the lines its own way. Fixes Swing labelling our messages with the global nickname instead of the one we have on the server, and linking our name in a private chat to the peer | | 10 | Android `ServerScreen`: one 456-line composable holding ~25 pieces of state | done (`78b66ef`): `ServerNav` holds where the screen is (one saved `ServerPage` for the five pages that replace it, tree or chat, the conversation, and one `Overlay` for the eight sheets and dialogs); `TreeView` and `ChatSearch` the find state of each side; `TreePicking` the long-press selection and moves. The sheets and dialogs are `ServerOverlay`; `VoiceBar` and `ServerSwitcher` have their own files. Only one sheet or dialog shows at a time, so a channel link in a client sheet now replaces it; Find in tree from a sheet honours Only matches; a failed channel deletion's snackbar is no longer cancelled with its dialog | -| 11 | Android `SessionController` (669 lines) is the app-wide view model and service locator; every screen gets all of it | in progress, in sub-steps: | -| 11a | … the app-wide stores out of it, and screens on the parts they use | done: `AppParts` wires what lives as long as the process; `BookmarkManager`, `ContactManager`, `WhisperListManager`, `MyTeamSpeakAccount` (sign-in, import, chat attachments) and `AudioSetup` (route, devices, sound packs, floating PTT button) hold what was in `SessionController`, which keeps the servers, the microphone between them and the voice settings (386 lines, with `SessionState` and `SessionEvent`). Leaf screens take only their parts; `App` and the settings hub take `AppParts`. Country flags and description pictures are set on `Settings` directly | -| 11b | … `ServerController` on narrow dependencies instead of the whole `SessionController`, which still forwards the stores to it | open | -| 12 | Swing `ui` package: 118 files, flat | open | +| 11 | Android `SessionController` (669 lines) is the app-wide view model and service locator; every screen gets all of it | done, in sub-steps: | +| 11a | … the app-wide stores out of it, and screens on the parts they use | done (`382d76c`): `AppParts` wires what lives as long as the process; `BookmarkManager`, `ContactManager`, `WhisperListManager`, `MyTeamSpeakAccount` (sign-in, import, chat attachments) and `AudioSetup` (route, devices, sound packs, floating PTT button) hold what was in `SessionController`, which keeps the servers, the microphone between them and the voice settings (386 lines, with `SessionState` and `SessionEvent`). Leaf screens take only their parts; `App` and the settings hub take `AppParts`. Country flags and description pictures are set on `Settings` directly | +| 11b | … `ServerController` on narrow dependencies instead of the whole `SessionController`, which still forwards the stores to it | done (`6070160`): `ServerParts` holds what every server shares (settings, identities, audio, contacts, myTeamSpeak, notifier, network) and builds its `ServerSession`; `SessionController` lost its pass-throughs and audio setup (`AppParts` builds the `LevelMonitor`). `ServerController` reports back to its owner directly: it has one, so no callback interface | +| 12 | Swing `ui` package: 118 files, flat | done: by feature. `ui` keeps the main window and what is app-wide (frame, commands, menus, toolbar, status bar, tabs, tray, notifications, look-and-feel, window placement); `ui.server` one server's tab (tree, info, context menus and their actions, file browser, connection info); `ui.chat` the chat and the HTML views (pictures, links, zoom); `ui.admin` moderation and the server's list windows; `ui.channel` the channel editor; `ui.options` the Options pages; `ui.hotkey` hotkeys; `ui.manage` bookmarks, contacts, identities and connecting; `ui.icons`; `ui.widget` the shared Swing bits (`Dialogs`, `Edt`, `FindBar`, `FormPanel`, …). What another package uses became public (~200 declarations); nothing else changed. The app icons moved to `ui/icons` with `Icons` | | 13 | `ClientEntry`/`ChannelNode` are bags of public volatile fields; a reader can see a half-applied update | open | | 14 | Core produces English UI copy (status lines, log lines) | open | diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/Main.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/Main.java index 4d33822..07113b7 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/Main.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/Main.java @@ -4,7 +4,7 @@ import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.session.ServerLink; import eu.lixko.ts3j.client.ui.DesktopEntry; import eu.lixko.ts3j.client.ui.DisplayScale; -import eu.lixko.ts3j.client.ui.IconTheme; +import eu.lixko.ts3j.client.ui.icons.IconTheme; import eu.lixko.ts3j.client.ui.InstanceChannel; import eu.lixko.ts3j.client.ui.LookAndFeelManager; import eu.lixko.ts3j.client.ui.MainFrame; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopEntry.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopEntry.java index 0dea2cc..088b779 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopEntry.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopEntry.java @@ -2,6 +2,7 @@ package eu.lixko.ts3j.client.ui; import eu.lixko.ts3j.client.Main; import eu.lixko.ts3j.client.session.ServerLink; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopNotifier.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopNotifier.java index 2a1c042..34fb7b8 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopNotifier.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesktopNotifier.java @@ -2,11 +2,12 @@ package eu.lixko.ts3j.client.ui; import eu.lixko.ts3j.client.chat.ChatKey; import eu.lixko.ts3j.client.config.Settings; -import eu.lixko.ts3j.client.notify.desktop.DesktopNotifications; import eu.lixko.ts3j.client.notify.desktop.DesktopNotifications.Notice; +import eu.lixko.ts3j.client.notify.desktop.DesktopNotifications; import eu.lixko.ts3j.client.notify.desktop.FreedesktopNotifications; import eu.lixko.ts3j.client.text.BBCode; import eu.lixko.ts3j.client.text.ChatHtml; +import eu.lixko.ts3j.client.ui.server.ServerTab; import eu.lixko.ts3j.client.ui.tray.AwtTray; import javax.swing.SwingUtilities; @@ -28,7 +29,7 @@ import java.util.concurrent.Executors; *

Called on the event thread. Talking to the desktop may block, so that happens on a * thread of its own, which also keeps the notifications in order. */ -final class DesktopNotifier { +public final class DesktopNotifier { private static final int MAX_LINES = 5; @@ -61,7 +62,7 @@ final class DesktopNotifier { this.settings = settings; } - void poke(ServerTab tab, String from, String message) { + public void poke(ServerTab tab, String from, String message) { if (!wanted()) return; String body = BBCode.toPlain(message); Notice notice = new Notice(from + " poked you", body, () -> open(tab, null), null); @@ -73,7 +74,7 @@ final class DesktopNotifier { }); } - void privateMessage(ServerTab tab, int clientId, String from, String message) { + public void privateMessage(ServerTab tab, int clientId, String from, String message) { if (!wanted()) return; String text = ChatHtml.plainMessage(message); Conversation key = new Conversation(tab, clientId); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HostButtonView.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HostButtonView.java index 6929483..7b27b44 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HostButtonView.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HostButtonView.java @@ -3,6 +3,9 @@ package eu.lixko.ts3j.client.ui; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.HostButton; import eu.lixko.ts3j.client.net.PictureDownloads; +import eu.lixko.ts3j.client.ui.chat.Links; +import eu.lixko.ts3j.client.ui.icons.IconTheme; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.ImageIcon; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LookAndFeelManager.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LookAndFeelManager.java index 805dfe7..360aa0f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LookAndFeelManager.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LookAndFeelManager.java @@ -4,6 +4,7 @@ import com.formdev.flatlaf.FlatDarkLaf; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLightLaf; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.icons.IconTheme; import java.awt.Window; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainCommands.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainCommands.java index 066f11c..13e4e04 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainCommands.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainCommands.java @@ -10,6 +10,12 @@ import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.session.Sessions; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.manage.AwayMessagesDialog; +import eu.lixko.ts3j.client.ui.manage.BookmarksDialog; +import eu.lixko.ts3j.client.ui.manage.IdentitiesDialog; +import eu.lixko.ts3j.client.ui.server.RecordingActions; +import eu.lixko.ts3j.client.ui.server.ServerTab; import javax.swing.JCheckBox; import javax.swing.JCheckBoxMenuItem; @@ -31,7 +37,7 @@ import java.util.function.Consumer; * for hotkeys, which reach the selected server or every connected one. Commands that * change our own state repaint the window's chrome afterwards. */ -final class MainCommands { +public final class MainCommands { private final MainFrame frame; private final Settings settings; @@ -68,7 +74,7 @@ final class MainCommands { * Which connections a command reaches: only the server on screen, or every connected * one. Either way only connected servers. */ - List targets(boolean currentOnly) { + public List targets(boolean currentOnly) { List out = new ArrayList<>(); if (currentOnly) { ServerSession current = current(); @@ -93,7 +99,7 @@ final class MainCommands { } /** Connects to the bookmark with this label; no label means the first one. */ - void connectBookmark(String label, boolean newTab) { + public void connectBookmark(String label, boolean newTab) { for (Bookmark b : bookmarks.all()) { if (label == null || label.isBlank() || label.equalsIgnoreCase(b.label)) { connect(b, newTab); @@ -102,12 +108,12 @@ final class MainCommands { } } - void disconnect() { + public void disconnect() { ServerSession current = current(); if (current != null) current.disconnect(); } - void disconnectAll() { + public void disconnectAll() { for (ServerTab tab : frame.allTabs()) tab.session().disconnect(); } @@ -155,7 +161,7 @@ final class MainCommands { // ---- microphone and speakers ---- /** Moves the microphone to the server on screen. */ - void activate() { + public void activate() { ServerSession current = current(); if (current != null && current.isConnected()) sessions.giveMicrophoneTo(current); frame.refreshChrome(); @@ -166,11 +172,11 @@ final class MainCommands { if (current != null) setMicMuted(currentConnected(), !current.isMicMuted()); } - void setMicMuted(List targets, boolean muted) { + public void setMicMuted(List targets, boolean muted) { forEach(targets, s -> s.setMicMuted(muted)); } - void setMicLocalMuted(List targets, boolean muted) { + public void setMicLocalMuted(List targets, boolean muted) { forEach(targets, s -> s.setMicLocalMuted(muted)); } @@ -179,18 +185,18 @@ final class MainCommands { if (current != null) setDeafened(currentConnected(), !current.isDeafened()); } - void setDeafened(List targets, boolean deaf) { + public void setDeafened(List targets, boolean deaf) { forEach(targets, s -> s.setDeafened(deaf)); } // ---- away ---- /** The plain toggle carries no message; "Set away status…" is where messages are chosen. */ - void setAway(boolean away) { + public void setAway(boolean away) { setAway(currentConnected(), away, ""); } - void setAway(List targets, boolean away, String message) { + public void setAway(List targets, boolean away, String message) { forEach(targets, s -> s.setAway(away, message == null ? "" : message)); } @@ -250,29 +256,29 @@ final class MainCommands { // ---- ourselves ---- - void setCommander(boolean commander) { + public void setCommander(boolean commander) { setCommander(currentConnected(), commander); } - void setCommander(List targets, boolean commander) { + public void setCommander(List targets, boolean commander) { forEach(targets, s -> s.setCommander(commander)); } /** Asks for a new nickname, used on every server. */ - void changeNickname() { + public void changeNickname() { String nickname = JOptionPane.showInputDialog(frame, "New nickname:", settings.nickname.get()); if (nickname != null) changeNickname(nickname); } /** Uses this nickname on every server; a blank one is ignored. */ - void changeNickname(String nickname) { + public void changeNickname(String nickname) { if (nickname == null || nickname.isBlank()) return; settings.nickname.set(nickname.trim()); settings.save(); sessions.setNickname(settings.nickname.get()); } - void joinChannel(List targets, String path) { + public void joinChannel(List targets, String path) { for (ServerSession s : targets) s.joinChannelPath(path); } @@ -310,7 +316,7 @@ final class MainCommands { } /** Requests talk power without a reason, or withdraws pending requests. */ - void toggleTalkRequest(List targets) { + public void toggleTalkRequest(List targets) { boolean requested = targets.stream().anyMatch(ServerSession::isTalkRequested); for (ServerSession s : targets) { if (requested) s.cancelTalkRequest(); @@ -318,28 +324,28 @@ final class MainCommands { } } - void grantNextTalkPower(List targets, boolean revokeOthers) { + public void grantNextTalkPower(List targets, boolean revokeOthers) { for (ServerSession s : targets) s.grantNextTalkPower(revokeOthers); } // ---- recording ---- /** Asks where to save, then records the server on screen. */ - void startRecording(boolean multitrack) { + public void startRecording(boolean multitrack) { ServerSession current = current(); if (current != null) recordings.choose(current, multitrack); } /** Records into the folder last used, without asking. */ - void startRecording(List targets, boolean multitrack) { + public void startRecording(List targets, boolean multitrack) { for (ServerSession s : targets) recordings.startNow(s, multitrack); } - void stopRecording() { + public void stopRecording() { stopRecording(currentConnected()); } - void stopRecording(List targets) { + public void stopRecording(List targets) { for (ServerSession s : targets) s.stopRecording(); } @@ -369,7 +375,7 @@ final class MainCommands { onTab(ServerTab::usePrivilegeKey); } - void browseCurrentChannel() { + public void browseCurrentChannel() { ServerTab tab = frame.selectedTab(); if (tab == null || !tab.session().isConnected()) return; ChannelNode channel = tab.session().currentChannel(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainFrame.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainFrame.java index 102ce48..4130753 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainFrame.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainFrame.java @@ -1,28 +1,39 @@ package eu.lixko.ts3j.client.ui; import com.formdev.flatlaf.util.UIScale; -import eu.lixko.ts3j.client.audio.VoiceOutput; import eu.lixko.ts3j.client.audio.AudioBackend; +import eu.lixko.ts3j.client.audio.VoiceOutput; import eu.lixko.ts3j.client.audio.desktop.DesktopAudioBackend; import eu.lixko.ts3j.client.config.AppDirs; import eu.lixko.ts3j.client.config.AwayMessages; import eu.lixko.ts3j.client.config.Bookmark; import eu.lixko.ts3j.client.config.Bookmarks; -import eu.lixko.ts3j.client.session.ServerLink; import eu.lixko.ts3j.client.config.IdentityStore; import eu.lixko.ts3j.client.config.Setting; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.contacts.ContactStore; import eu.lixko.ts3j.client.myts.ChatAttachments; import eu.lixko.ts3j.client.myts.MyTeamSpeakLogin; -import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter; -import eu.lixko.ts3j.client.contacts.ContactStore; import eu.lixko.ts3j.client.net.HostButton; import eu.lixko.ts3j.client.net.PictureDownloads; import eu.lixko.ts3j.client.session.SelfState; +import eu.lixko.ts3j.client.session.ServerLink; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.session.Sessions; import eu.lixko.ts3j.client.sound.SoundNotifier; import eu.lixko.ts3j.client.sound.SoundPlayer; +import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter; +import eu.lixko.ts3j.client.ui.chat.Links; +import eu.lixko.ts3j.client.ui.chat.TextZoom; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyActions; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyService; +import eu.lixko.ts3j.client.ui.icons.IconTheme; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.manage.ConnectDialog; +import eu.lixko.ts3j.client.ui.manage.ContactsDialog; +import eu.lixko.ts3j.client.ui.options.MyTeamSpeakPanel; +import eu.lixko.ts3j.client.ui.options.SettingsDialog; +import eu.lixko.ts3j.client.ui.server.ServerTab; import eu.lixko.ts3j.client.ui.tray.TrayBackend; import javax.swing.AbstractAction; @@ -288,7 +299,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { // ---- callbacks from ServerTab ---- /** A tab's title, status or connection state changed. */ - void tabUpdated(ServerTab tab) { + public void tabUpdated(ServerTab tab) { if (!tabs.contains(tab)) return; refreshTabs(); if (tab == selected) { @@ -299,12 +310,12 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { } /** The server on {@code tab} may have changed its host button. */ - void refreshHostButton(ServerTab tab) { + public void refreshHostButton(ServerTab tab) { if (tab == selected) toolbar.showHostButton(hostButtonOf(tab)); } /** Bookmarks leading to the server on {@code tab} take on its icon. */ - void serverIconChanged(ServerTab tab, long iconId) { + public void serverIconChanged(ServerTab tab, long iconId) { if (!bookmarks.rememberServerIcon(tab.session().address(), tab.session().port(), iconId)) return; bookmarks.save(); bookmarksChanged(); @@ -321,24 +332,24 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { repaint(); } - MainCommands commands() { + public MainCommands commands() { return commands; } /** The local client on {@code tab} started or stopped talking, muted itself, … */ - void selfStateChanged(ServerTab tab) { + public void selfStateChanged(ServerTab tab) { if (!tabs.contains(tab)) return; updateTray(); if (giantPtt != null) giantPtt.refresh(); } - void tabConnected(ServerTab tab) { + public void tabConnected(ServerTab tab) { if (!tabs.contains(tab)) return; sessions.connected(tab.session()); tabUpdated(tab); } - void tabDisconnected(ServerTab tab) { + public void tabDisconnected(ServerTab tab) { if (!tabs.contains(tab)) return; sessions.disconnected(tab.session()); notifier.forget(tab); @@ -346,15 +357,15 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { } /** Tells the user of a poke or a private message while the client is in the background. */ - TextZoom chatZoom() { + public TextZoom chatZoom() { return chatZoom; } - TextZoom infoZoom() { + public TextZoom infoZoom() { return infoZoom; } - DesktopNotifier notifier() { + public DesktopNotifier notifier() { return notifier; } @@ -375,7 +386,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { } /** Opens the microphone while a push-to-talk hotkey is held. */ - void setPushToTalk(boolean talking) { + public void setPushToTalk(boolean talking) { sessions.setPushToTalk(talking); } @@ -398,36 +409,36 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { } /** Selects the tab with this 1-based number, as the "Select Server Tab" action names it. */ - void selectTabNumber(int number) { + public void selectTabNumber(int number) { if (number >= 1 && number <= tabs.size()) selectTab(tabs.get(number - 1)); } - void stepTab(int delta) { + public void stepTab(int delta) { if (tabs.isEmpty()) return; int index = Math.max(0, tabs.indexOf(selected)); selectTab(tabs.get(Math.floorMod(index + delta, tabs.size()))); } - void setSoundsMuted(boolean muted) { + public void setSoundsMuted(boolean muted) { sounds.setMuted(muted); } - boolean areSoundsMuted() { + public boolean areSoundsMuted() { return sounds.isMuted(); } - void adjustMasterVolume(double delta) { + public void adjustMasterVolume(double delta) { settings.outputVolume.set(Math.max(0, Math.min(2.0, settings.outputVolume.get() + delta))); settings.save(); updateStatusLabel(); } - void reloadSkin() { + public void reloadSkin() { IconTheme.get().reload(settings); } /** Brings the window back from the tray, the taskbar or behind other windows. */ - void bringToFront() { + public void bringToFront() { TrayController current = tray; if (current != null) { // The tray can ask the window manager in a way it honours for a window without focus. @@ -440,7 +451,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { requestFocus(); } - void sendToBack() { + public void sendToBack() { setExtendedState(getExtendedState() | JFrame.ICONIFIED); } @@ -594,7 +605,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { System.exit(0); } - Settings settings() { + public Settings settings() { return settings; } @@ -606,7 +617,7 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { * * @param uniqueId the contact to select, or {@code null} to keep the current selection */ - void showContacts(String uniqueId) { + public void showContacts(String uniqueId) { if (contactsDialog == null || !contactsDialog.isDisplayable()) { contactsDialog = new ContactsDialog(this, contacts, settings); } @@ -647,16 +658,16 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener { } } - ChatAttachments attachments() { + public ChatAttachments attachments() { return attachments; } - MyTeamSpeakLogin myTeamSpeakLogin() { + public MyTeamSpeakLogin myTeamSpeakLogin() { return myTeamSpeak; } /** Whether files can be shared in chat: that needs a myTeamSpeak account. */ - boolean canShareFiles() { + public boolean canShareFiles() { return myTeamSpeak.isSignedIn(); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainMenuBar.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainMenuBar.java index d1a6bd2..b3be1b0 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainMenuBar.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainMenuBar.java @@ -4,6 +4,8 @@ import eu.lixko.ts3j.client.config.Bookmark; import eu.lixko.ts3j.client.config.Bookmarks; import eu.lixko.ts3j.client.net.Permissions; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.ImageIcon; import javax.swing.JCheckBoxMenuItem; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainToolbar.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainToolbar.java index 3b03e8e..07d81e8 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainToolbar.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MainToolbar.java @@ -5,6 +5,8 @@ import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.net.HostButton; import eu.lixko.ts3j.client.net.PictureDownloads; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.DropDownToggleButton; import javax.swing.Box; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabPane.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabPane.java index 4f4c14e..397f7a4 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabPane.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabPane.java @@ -2,6 +2,8 @@ package eu.lixko.ts3j.client.ui; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.server.ServerTab; import javax.swing.BorderFactory; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/StatusBar.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/StatusBar.java index 3368f9b..c20e288 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/StatusBar.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/StatusBar.java @@ -2,6 +2,7 @@ package eu.lixko.ts3j.client.ui; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TabDragReorder.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TabDragReorder.java index e9614d1..4ec06b1 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TabDragReorder.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TabDragReorder.java @@ -28,10 +28,10 @@ import java.util.List; * press, so every component that should start a drag — the tab strip itself * and each custom tab label — must be {@link #attach}ed individually. */ -final class TabDragReorder { +public final class TabDragReorder { /** Moves the tab at {@code from} to sit where {@code to} currently is. */ - interface Reorder { + public interface Reorder { void moveTab(int from, int to); } @@ -59,12 +59,12 @@ final class TabDragReorder { private int grabDx; private Timer timer; - TabDragReorder(JTabbedPane tabbed, Reorder reorder) { + public TabDragReorder(JTabbedPane tabbed, Reorder reorder) { this.tabbed = tabbed; this.reorder = reorder; } - void attach(JComponent source) { + public void attach(JComponent source) { MouseAdapter listener = new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TrayController.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TrayController.java index 6aa7c36..3c33c09 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TrayController.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TrayController.java @@ -1,6 +1,7 @@ package eu.lixko.ts3j.client.ui; import eu.lixko.ts3j.client.session.SelfState; +import eu.lixko.ts3j.client.ui.icons.Icons; import eu.lixko.ts3j.client.ui.tray.AwtTray; import eu.lixko.ts3j.client.ui.tray.TrayBackend; import eu.lixko.ts3j.client.ui.tray.X11Tray; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractServerListDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/AbstractServerListDialog.java similarity index 95% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractServerListDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/AbstractServerListDialog.java index fc207c1..e8fc221 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractServerListDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/AbstractServerListDialog.java @@ -1,9 +1,13 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.RequestException; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.AbstractAction; import javax.swing.Box; @@ -39,7 +43,7 @@ import java.util.function.Supplier; * *

One per server tab; the tab closes it when the connection goes away. */ -abstract class AbstractServerListDialog extends JDialog { +public abstract class AbstractServerListDialog extends JDialog { static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -112,12 +116,12 @@ abstract class AbstractServerListDialog extends JDialog { return name + " - " + serverName; } - void serverNameChanged() { + public void serverNameChanged() { String serverName = session.model().getServerName(); setTitle(serverName == null || serverName.isBlank() ? name : title(serverName)); } - void connectionLost() { + public void connectionLost() { dispose(); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanAddDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanAddDialog.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanAddDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanAddDialog.java index 610a116..deca0a7 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanAddDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanAddDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.config.BanReasonPresets; import eu.lixko.ts3j.client.net.ban.BanEntry; import eu.lixko.ts3j.client.net.ban.BanPattern; import eu.lixko.ts3j.client.net.ban.BanRule; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDialog.java similarity index 89% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDialog.java index 8dd4ef0..0d2603a 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDialog.java @@ -1,8 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ban.BanRule; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; @@ -17,7 +18,7 @@ import java.awt.Frame; * Asks for a ban's reason and duration, like the official client's ban dialog: * either a number of seconds, minutes, hours or days, or permanent. */ -final class BanDialog extends JDialog { +public final class BanDialog extends JDialog { private final JTextField reasonField = ReasonDialog.reasonField(BanRule.REASON_LIMIT); private final BanDurationPicker duration; @@ -27,7 +28,7 @@ final class BanDialog extends JDialog { /** * @param maxSeconds the longest ban the server lets us hand out, or 0 for no limit */ - BanDialog(Frame owner, String nickname, long maxSeconds) { + public BanDialog(Frame owner, String nickname, long maxSeconds) { super(owner, "Ban Client", true); duration = new BanDurationPicker(maxSeconds); @@ -71,16 +72,16 @@ final class BanDialog extends JDialog { return panel; } - boolean isConfirmed() { + public boolean isConfirmed() { return confirmed; } - String getReason() { + public String getReason() { return reasonField.getText().trim(); } /** The ban's length in seconds, or 0 for a permanent ban. */ - long getSeconds() { + public long getSeconds() { return duration.getSeconds(); } } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDurationPicker.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDurationPicker.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDurationPicker.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDurationPicker.java index 651108c..4ffb6d3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanDurationPicker.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanDurationPicker.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ban.BanUnit; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanListDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanListDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanListDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanListDialog.java index aacbc22..6d17cdd 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BanListDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/BanListDialog.java @@ -1,12 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.BanReasonPresets; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.net.Permissions; -import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.net.ban.BanEntry; import eu.lixko.ts3j.client.net.ban.BanRule; +import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.Box; import javax.swing.BoxLayout; @@ -48,7 +50,7 @@ import java.util.stream.Collectors; * Which columns show is chosen from the header's context menu and remembered. * */ -final class BanListDialog extends AbstractServerListDialog { +public final class BanListDialog extends AbstractServerListDialog { /** The table's columns, in the official order; the split-out target columns start hidden. */ private enum Column { @@ -92,7 +94,7 @@ final class BanListDialog extends AbstractServerListDialog { private final JCheckBox onlyOwn = new JCheckBox("Show only own bans"); private final JCheckBox highlightOwn = new JCheckBox("Highlight own bans"); - BanListDialog(Frame owner, ServerSession session, Settings settings, BanReasonPresets presets) { + public BanListDialog(Frame owner, ServerSession session, Settings settings, BanReasonPresets presets) { super(owner, session, "Ban List"); this.owner = owner; this.settings = settings; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ComplaintsDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ComplaintsDialog.java index 5ba0dff..a8dfa5c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ComplaintsDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.Complaint; import eu.lixko.ts3j.client.net.ServerModel; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.Box; import javax.swing.BoxLayout; @@ -45,7 +46,7 @@ import java.util.function.Consumer; * collapsible row per client complained about, with each complaint's date, author and * reason beneath it. */ -final class ComplaintsDialog extends AbstractServerListDialog { +public final class ComplaintsDialog extends AbstractServerListDialog { private enum Column { TARGET("Target Nickname", 200), @@ -93,7 +94,7 @@ final class ComplaintsDialog extends AbstractServerListDialog { private final Set expanded = new HashSet<>(); /** @param banClient opens the ban dialog for an online client */ - ComplaintsDialog(Frame owner, ServerSession session, Consumer banClient) { + public ComplaintsDialog(Frame owner, ServerSession session, Consumer banClient) { super(owner, session, "Complaints List"); this.banClient = banClient; bindKeys(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessageComposeDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessageComposeDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessageComposeDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessageComposeDialog.java index 66d2379..d055e5f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessageComposeDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessageComposeDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.util.ScaledEmptyBorder; @@ -10,6 +10,9 @@ import eu.lixko.ts3j.client.net.DatabaseClient; import eu.lixko.ts3j.client.net.OfflineMessage; import eu.lixko.ts3j.client.net.OfflineMessageAdmin; import eu.lixko.ts3j.client.text.BBCode; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.BorderFactory; import javax.swing.Box; @@ -65,7 +68,7 @@ import java.util.regex.Pattern; * only searches the server's database, a unique id is looked up directly, which needs no * permission; a nickname needs {@code b_virtualserver_client_dbsearch}. */ -final class OfflineMessageComposeDialog extends JDialog { +public final class OfflineMessageComposeDialog extends JDialog { private static final Pattern UNIQUE_ID = Pattern.compile("[A-Za-z0-9+/]{27}="); /** The client property naming the recipient a chip stands for. */ @@ -86,12 +89,12 @@ final class OfflineMessageComposeDialog extends JDialog { private final JButton sendButton = new JButton("Send"); private boolean sending; - static OfflineMessageComposeDialog compose(Window owner, OfflineMessageAdmin messages, ContactStore contacts) { + public static OfflineMessageComposeDialog compose(Window owner, OfflineMessageAdmin messages, ContactStore contacts) { return new OfflineMessageComposeDialog(owner, "New Offline Message", messages, contacts); } /** A reply to {@code message}, quoting {@code body}. */ - static OfflineMessageComposeDialog reply(Window owner, OfflineMessageAdmin messages, ContactStore contacts, + public static OfflineMessageComposeDialog reply(Window owner, OfflineMessageAdmin messages, ContactStore contacts, OfflineMessage message, String body) { OfflineMessageComposeDialog d = new OfflineMessageComposeDialog(owner, "Reply Offline Message", messages, contacts); d.addRecipient(new DatabaseClient(message.senderUid(), 0, message.senderName())); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessagesDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessagesDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessagesDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessagesDialog.java index 93ebeee..23d66f2 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OfflineMessagesDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/OfflineMessagesDialog.java @@ -1,10 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.OfflineMessage; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.text.BBCode; +import eu.lixko.ts3j.client.ui.chat.HtmlStyles; +import eu.lixko.ts3j.client.ui.chat.Links; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.Box; import javax.swing.BoxLayout; @@ -50,10 +54,10 @@ import java.util.Set; * window: the messages above, the selected one's subject and text below. Viewing a message * marks it read. */ -final class OfflineMessagesDialog extends AbstractServerListDialog { +public final class OfflineMessagesDialog extends AbstractServerListDialog { /** Where Compose and Reply lead: the tab opens the compose window. */ - interface Composer { + public interface Composer { void compose(); void reply(OfflineMessage message, String body); @@ -109,7 +113,7 @@ final class OfflineMessagesDialog extends AbstractServerListDialog { /** Set while a right-click selects its row, which leaves the reader alone. */ private boolean selectingForPopup; - OfflineMessagesDialog(Frame owner, ServerSession session, Composer composer) { + public OfflineMessagesDialog(Frame owner, ServerSession session, Composer composer) { super(owner, session, "Offline Messages"); this.composer = composer; @@ -245,7 +249,7 @@ final class OfflineMessagesDialog extends AbstractServerListDialog { /** Reads the inbox again, keeping the selection where the messages are still there. */ @Override - void reload() { + public void reload() { load(session.offlineMessages()::list, messages -> { setMessages(messages); if (messages.isEmpty()) showStatus("No messages"); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeyCreateDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeyCreateDialog.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeyCreateDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeyCreateDialog.java index 1ac31d5..908ebe9 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeyCreateDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeyCreateDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,11 @@ import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.net.Group; import eu.lixko.ts3j.client.net.ServerModel; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.Edt; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.Box; import javax.swing.ButtonGroup; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeysDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeysDialog.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeysDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeysDialog.java index 1b39f22..34ea73d 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PrivilegeKeysDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/PrivilegeKeysDialog.java @@ -1,10 +1,12 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.Group; import eu.lixko.ts3j.client.net.PrivilegeKey; import eu.lixko.ts3j.client.net.ServerModel; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.Box; import javax.swing.BoxLayout; @@ -31,7 +33,7 @@ import java.util.stream.Collectors; * The server's privilege keys, as the official client's Permissions > Privilege Keys * window: Create and Remove above the list, Reload below it. */ -final class PrivilegeKeysDialog extends AbstractServerListDialog { +public final class PrivilegeKeysDialog extends AbstractServerListDialog { private enum Column { KEY("Privilege Key", 320), @@ -57,7 +59,7 @@ final class PrivilegeKeysDialog extends AbstractServerListDialog { private final JButton createButton = new JButton("Create", Icons.of("ADD")); private final JButton removeButton = new JButton("Remove", Icons.of("DELETE")); - PrivilegeKeysDialog(Frame owner, ServerSession session, GroupIcons groupIcons) { + public PrivilegeKeysDialog(Frame owner, ServerSession session, GroupIcons groupIcons) { super(owner, session, "Privilege Keys"); this.groupIcons = groupIcons; bindKeys(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ReasonDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ReasonDialog.java similarity index 93% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ReasonDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ReasonDialog.java index 565adde..bc9f61d 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ReasonDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ReasonDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; @@ -20,13 +20,13 @@ import java.awt.Dimension; * Asks for the reason text that goes with a moderation action. The server caps * such messages, so the field refuses anything longer. */ -final class ReasonDialog { +public final class ReasonDialog { private ReasonDialog() { } /** @return the reason (possibly empty), or {@code null} when the dialog was cancelled */ - static String prompt(Component owner, String title, String message, int maxLength) { + public static String prompt(Component owner, String title, String message, int maxLength) { JTextField field = reasonField(maxLength); focusWhenShown(field); @@ -49,7 +49,7 @@ final class ReasonDialog { } /** A left-aligned label with a little air below it, for use in a box layout. */ - static JLabel label(String text) { + public static JLabel label(String text) { JLabel label = new JLabel(text); label.setAlignmentX(Component.LEFT_ALIGNMENT); label.setBorder(new ScaledEmptyBorder(0, 0, 4, 0)); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerGroupsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerGroupsDialog.java similarity index 90% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerGroupsDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerGroupsDialog.java index 7d3720c..e521159 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerGroupsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerGroupsDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,10 @@ import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.Group; import eu.lixko.ts3j.client.net.GroupChoice; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.MainFrame; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.server.ServerTreePanel; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.BoxLayout; import javax.swing.GrayFilter; @@ -27,7 +31,7 @@ import java.util.Map; * the local client has no power to (un)assign are shown too, so the client's full * membership is visible, but greyed out and disabled. */ -final class ServerGroupsDialog extends JDialog { +public final class ServerGroupsDialog extends JDialog { private final ServerSession session; private final GroupIcons groupIcons; @@ -39,7 +43,7 @@ final class ServerGroupsDialog extends JDialog { /** Cached grayscale icons, keyed by the source icon's identity. */ private final Map grayscale = new HashMap<>(); - ServerGroupsDialog(MainFrame owner, ServerSession session, GroupIcons groupIcons, + public ServerGroupsDialog(MainFrame owner, ServerSession session, GroupIcons groupIcons, ClientEntry client, ServerTreePanel.Actions actions) { super(owner, "Server Groups", true); this.session = session; @@ -74,7 +78,7 @@ final class ServerGroupsDialog extends JDialog { } /** Rebuilds the list from the current model state; closes the dialog if the client left. */ - void refresh() { + public void refresh() { ClientEntry client = session.model().getClient(clientId); if (client == null) { dispose(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogDialog.java index 3b7521c..b5785fc 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogDialog.java @@ -1,15 +1,17 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; -import eu.lixko.ts3j.client.config.ServerLogSettings; import eu.lixko.ts3j.client.config.ServerLogSettings.Highlight; +import eu.lixko.ts3j.client.config.ServerLogSettings; import eu.lixko.ts3j.client.config.Settings; -import eu.lixko.ts3j.client.net.ServerLogEntry; import eu.lixko.ts3j.client.net.ServerLogEntry.Level; +import eu.lixko.ts3j.client.net.ServerLogEntry; import eu.lixko.ts3j.client.net.ServerLogPage; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.text.TextQuery; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.chat.ChatSearch; import javax.swing.Box; import javax.swing.BoxLayout; @@ -47,7 +49,7 @@ import java.util.Map; * by keyword. Find (with "show only matches") stands in for TS3's separate search and * include-filter fields. */ -final class ServerLogDialog extends AbstractServerListDialog { +public final class ServerLogDialog extends AbstractServerListDialog { private static final int LEVEL_WIDTH = "Critical".length(); @@ -83,7 +85,7 @@ final class ServerLogDialog extends AbstractServerListDialog { private long olderFrom; private TextQuery onlyMatching; - ServerLogDialog(Frame owner, ServerSession session, Settings settings) { + public ServerLogDialog(Frame owner, ServerSession session, Settings settings) { super(owner, session, "Server Log"); this.settings = settings; this.view = settings.serverLog; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogExcludeDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogExcludeDialog.java similarity index 87% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogExcludeDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogExcludeDialog.java index 8ecb1d5..732db6f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogExcludeDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogExcludeDialog.java @@ -1,4 +1,6 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; + +import eu.lixko.ts3j.client.ui.manage.AbstractListEditorDialog; import java.awt.Window; import java.util.List; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogHighlightDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogHighlightDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogHighlightDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogHighlightDialog.java index 3f9166f..0607657 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerLogHighlightDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/admin/ServerLogHighlightDialog.java @@ -1,7 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.admin; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.ServerLogSettings.Highlight; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.manage.AbstractListEditorDialog; import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAdvancedPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAdvancedPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAdvancedPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAdvancedPanel.java index bd370b6..b4068d8 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAdvancedPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAdvancedPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAudioPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAudioPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAudioPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAudioPanel.java index 13f819a..4c609cc 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelAudioPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelAudioPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelDialog.java index a29d4e2..a24c10a 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelDialog.java @@ -1,10 +1,13 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.net.ChannelSettings; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -49,7 +52,7 @@ import java.util.concurrent.CompletableFuture; * caller chose and sends a {@code channelcreate} carrying whatever deviates from a plain * new channel, for the same reason. */ -final class ChannelDialog extends JDialog { +public final class ChannelDialog extends JDialog { /** A tab that maps a part of the channel's settings onto its controls. */ interface Tab { @@ -107,7 +110,7 @@ final class ChannelDialog extends JDialog { private boolean passwordEdited; /** The editor for an existing channel. */ - static ChannelDialog toEdit(Window owner, ServerSession session, GroupIcons groupIcons, + public static ChannelDialog toEdit(Window owner, ServerSession session, GroupIcons groupIcons, ChannelNode channel) { return new ChannelDialog(owner, session, groupIcons, "Edit Channel: " + channel.name, channel, channel.parentId, null); @@ -119,7 +122,7 @@ final class ChannelDialog extends JDialog { * @param parentId the channel it goes below, 0 being the top level * @param defaults what the dialog opens with, e.g. the channel type its caller prefers */ - static ChannelDialog toCreate(Window owner, ServerSession session, GroupIcons groupIcons, + public static ChannelDialog toCreate(Window owner, ServerSession session, GroupIcons groupIcons, String title, int parentId, ChannelSettings defaults) { return new ChannelDialog(owner, session, groupIcons, title, null, parentId, defaults); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelPermissionsPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelPermissionsPanel.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelPermissionsPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelPermissionsPanel.java index 3d05315..217a882 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelPermissionsPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelPermissionsPanel.java @@ -1,7 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; +import eu.lixko.ts3j.client.ui.Theme; import javax.swing.BorderFactory; import javax.swing.Box; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelStandardPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelStandardPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelStandardPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelStandardPanel.java index d36a335..fe93ba3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelStandardPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/ChannelStandardPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionEditorDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/DescriptionEditorDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionEditorDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/DescriptionEditorDialog.java index 0fc5757..20e50f0 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionEditorDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/DescriptionEditorDialog.java @@ -1,8 +1,10 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.text.BBCode; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconChooserDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/IconChooserDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconChooserDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/IconChooserDialog.java index a3d4a12..7019c6b 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconChooserDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/IconChooserDialog.java @@ -1,9 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; -import eu.lixko.ts3j.client.net.IconRepository; import eu.lixko.ts3j.client.net.ChannelAdmin; +import eu.lixko.ts3j.client.net.IconRepository; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.IconTheme; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.BorderFactory; import javax.swing.DefaultListModel; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Spinners.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/Spinners.java similarity index 95% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Spinners.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/Spinners.java index 6801ee5..b91ba77 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Spinners.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/channel/Spinners.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.channel; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AttachmentTransferHandler.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AttachmentTransferHandler.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AttachmentTransferHandler.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AttachmentTransferHandler.java index a5df171..e03ccfc 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AttachmentTransferHandler.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AttachmentTransferHandler.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import javax.swing.JComponent; import javax.swing.TransferHandler; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarHtml.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AvatarHtml.java similarity index 88% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarHtml.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AvatarHtml.java index adcb507..1b50198 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarHtml.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/AvatarHtml.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.avatar.Avatar; @@ -16,16 +16,16 @@ import java.util.Iterator; * the repository's on-disk copy, drawn at the interface scale and fitted to a box while * keeping its aspect ratio. */ -final class AvatarHtml { +public final class AvatarHtml { /** The largest box an avatar is drawn in, as in the official client's info frame. */ - static final int MAX_SIZE = 200; + public static final int MAX_SIZE = 200; private AvatarHtml() { } /** @return the tag, or an empty string if the avatar cannot be shown */ - static String imgTag(Avatar avatar, int maxSize) { + public static String imgTag(Avatar avatar, int maxSize) { if (avatar == null || avatar.file() == null) return ""; Dimension natural = dimensions(avatar.data()); Dimension size = fit(natural == null ? null : UIScale.scale(natural), maxSize); @@ -34,7 +34,7 @@ final class AvatarHtml { } /** Reads only the image header, which is cheap even for a large animation. */ - static Dimension dimensions(byte[] data) { + public static Dimension dimensions(byte[] data) { try (ImageInputStream in = ImageIO.createImageInputStream(new ByteArrayInputStream(data))) { Iterator readers = ImageIO.getImageReaders(in); if (!readers.hasNext()) return null; @@ -51,7 +51,7 @@ final class AvatarHtml { } /** Scales {@code size} down (never up) to fit a square box of {@code max}. */ - static Dimension fit(Dimension size, int max) { + public static Dimension fit(Dimension size, int max) { if (size == null || size.width <= 0 || size.height <= 0) return null; if (size.width <= max && size.height <= max) return size; double scale = Math.min((double) max / size.width, (double) max / size.height); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatAttachmentActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatAttachmentActions.java similarity index 94% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatAttachmentActions.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatAttachmentActions.java index b2d28d0..a80b95d 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatAttachmentActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatAttachmentActions.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import eu.lixko.ts3j.client.chat.ChatKey; import eu.lixko.ts3j.client.myts.ChatAttachment; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.myts.ChatAttachments; import eu.lixko.ts3j.client.myts.MyTsException; import eu.lixko.ts3j.client.net.PictureDownloads; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.MainFrame; import javax.imageio.ImageIO; import javax.swing.JFileChooser; @@ -24,7 +25,7 @@ import java.util.List; * Shares files in one server's chats through myTeamSpeak, and shows and saves the files * shared there. Failures land in the chat as system lines. */ -final class ChatAttachmentActions implements ChatPanel.AttachmentHandler { +public final class ChatAttachmentActions implements ChatPanel.AttachmentHandler { private static final String SIGN_IN = "Sign in to myTeamSpeak to share files"; private static final String PASTED_NAME = "image.png"; @@ -37,7 +38,7 @@ final class ChatAttachmentActions implements ChatPanel.AttachmentHandler { private final ChatPanel chat; private final PictureDownloads pictures; - ChatAttachmentActions(MainFrame host, ServerSession session, ChatPanel chat, PictureDownloads pictures) { + public ChatAttachmentActions(MainFrame host, ServerSession session, ChatPanel chat, PictureDownloads pictures) { this.host = host; this.session = session; this.chat = chat; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatPanel.java index a7de698..70cde55 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -11,6 +11,9 @@ import eu.lixko.ts3j.client.text.ChatHtml; import eu.lixko.ts3j.client.text.HtmlText; import eu.lixko.ts3j.client.text.TextQuery; import eu.lixko.ts3j.client.text.TsLink; +import eu.lixko.ts3j.client.ui.TabDragReorder; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.AbstractAction; import javax.swing.BorderFactory; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatSearch.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatSearch.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatSearch.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatSearch.java index 4e49371..8db243d 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatSearch.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/ChatSearch.java @@ -1,6 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import eu.lixko.ts3j.client.text.TextQuery; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.widget.FindBar; import javax.swing.JEditorPane; import javax.swing.JToggleButton; @@ -25,10 +27,10 @@ import java.util.regex.Matcher; * query's matches and steps through them, newest first. Optionally shows only the * messages that match. */ -final class ChatSearch implements FindBar.Listener { +public final class ChatSearch implements FindBar.Listener { /** The conversation being searched: whichever chat tab is selected. */ - interface Host { + public interface Host { /** The selected tab's log, or {@code null} when there is none. */ JEditorPane selectedLog(); @@ -76,16 +78,16 @@ final class ChatSearch implements FindBar.Listener { queueRehighlight(); }; - ChatSearch(Host host) { + public ChatSearch(Host host) { this(host, "Show only matching messages"); } - ChatSearch(Host host, String filterTooltip) { + public ChatSearch(Host host, String filterTooltip) { this.host = host; onlyMatching = bar.addFilterToggle(filterTooltip); } - FindBar bar() { + public FindBar bar() { return bar; } @@ -93,7 +95,7 @@ final class ChatSearch implements FindBar.Listener { return bar.isOpen(); } - void open() { + public void open() { retarget(); bar.open(); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionPictures.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/DescriptionPictures.java similarity index 94% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionPictures.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/DescriptionPictures.java index d126113..051a908 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DescriptionPictures.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/DescriptionPictures.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.Settings; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.myts.ChatAttachment; import eu.lixko.ts3j.client.net.PictureDownloads; import eu.lixko.ts3j.client.text.BBCode; import eu.lixko.ts3j.client.text.ChatHtml; +import eu.lixko.ts3j.client.ui.icons.IconFiles; import javax.imageio.ImageIO; import javax.imageio.ImageReader; @@ -26,7 +27,7 @@ import java.util.regex.Pattern; * narrowed to fit, with a loading icon while one comes. With pictures turned off, or when one * cannot be had, it is a link to the picture behind a picture icon instead. */ -final class DescriptionPictures { +public final class DescriptionPictures { /** A picture, and the links it may sit in. */ private static final Pattern TAG = Pattern.compile( @@ -37,22 +38,22 @@ final class DescriptionPictures { private final Settings settings; private final Map sizes = new ConcurrentHashMap<>(); - DescriptionPictures(PictureDownloads downloads, Settings settings) { + public DescriptionPictures(PictureDownloads downloads, Settings settings) { this.downloads = downloads; this.settings = settings; } - static boolean hasPictures(String html) { + public static boolean hasPictures(String html) { return html.contains(" serverLinks; @@ -20,11 +20,11 @@ final class Links { } /** Where {@code ts3server://} links go. */ - static void setServerLinkHandler(Consumer handler) { + public static void setServerLinkHandler(Consumer handler) { serverLinks = handler; } - static void open(String href, Component parent) { + public static void open(String href, Component parent) { ServerLink link = ServerLink.parse(href); Consumer handler = serverLinks; if (link != null && handler != null) { diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PictureViewer.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/PictureViewer.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PictureViewer.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/PictureViewer.java index 7932ff5..b51ac66 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PictureViewer.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/PictureViewer.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TextZoom.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/TextZoom.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TextZoom.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/TextZoom.java index 9d66e64..51a172c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/TextZoom.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/chat/TextZoom.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.chat; import javax.swing.JEditorPane; import javax.swing.JViewport; @@ -19,7 +19,7 @@ import java.util.function.DoubleConsumer; * A zoom level for the text and pictures of {@link HtmlStyles} panes, changed with * Ctrl+mouse wheel over any of them and applied to all of them, in a browser's steps. */ -final class TextZoom { +public final class TextZoom { private static final double[] LEVELS = {0.5, 0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3}; @@ -28,7 +28,7 @@ final class TextZoom { private double factor; /** @param onChange told the new factor after every change, e.g. to save it */ - TextZoom(double factor, DoubleConsumer onChange) { + public TextZoom(double factor, DoubleConsumer onChange) { this.factor = nearestLevel(factor); this.onChange = onChange; } @@ -40,7 +40,7 @@ final class TextZoom { } /** Zooms {@code pane} with this zoom, and lets Ctrl+wheel over it change it. */ - void attach(JEditorPane pane) { + public void attach(JEditorPane pane) { if (pane.getClientProperty(TextZoom.class) == this) return; pane.putClientProperty(TextZoom.class, this); panes.add(pane); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyActions.java similarity index 95% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyActions.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyActions.java index a561174..40ddc9e 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyActions.java @@ -1,8 +1,10 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.hotkey; import eu.lixko.ts3j.client.hotkey.Hotkey; import eu.lixko.ts3j.client.hotkey.HotkeyEngine; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.MainCommands; +import eu.lixko.ts3j.client.ui.MainFrame; import javax.swing.SwingUtilities; import java.util.List; @@ -15,7 +17,7 @@ import java.util.function.Predicate; * event dispatch thread first. Which connections an action reaches is the binding's * "on active server" flag: set, only the selected tab; clear, every connected one. */ -final class HotkeyActions implements HotkeyEngine.Handler { +public final class HotkeyActions implements HotkeyEngine.Handler { /** How much one press of the master-volume hotkeys moves the slider. */ private static final double VOLUME_STEP = 0.05; @@ -25,7 +27,7 @@ final class HotkeyActions implements HotkeyEngine.Handler { /** Latched push-to-talk, driven by the "Toggle Push-to-Talk" action. */ private boolean pttLatched; - HotkeyActions(MainFrame frame, MainCommands commands) { + public HotkeyActions(MainFrame frame, MainCommands commands) { this.frame = frame; this.commands = commands; } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyArguments.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyArguments.java similarity index 86% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyArguments.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyArguments.java index f280d00..47f9b9d 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyArguments.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyArguments.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.hotkey; import eu.lixko.ts3j.client.hotkey.HotkeyAction; @@ -9,7 +9,7 @@ import java.util.List; * packs and channels the hotkey tree hangs under an action as its leaves, so a binding * reads as "Sounds / Activate Soundpack / Default Sound Pack (Male)". */ -interface HotkeyArguments { +public interface HotkeyArguments { /** @return the choices for this action, or an empty list when it is free-form */ List choices(HotkeyAction action); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyDialog.java index d694433..daa3361 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.hotkey; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.hotkey.Hotkey; import eu.lixko.ts3j.client.hotkey.HotkeyAction; import eu.lixko.ts3j.client.hotkey.HotkeyCombo; import eu.lixko.ts3j.client.hotkey.HotkeyEngine; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.DefaultListCellRenderer; @@ -42,7 +43,7 @@ import java.util.List; * concrete bookmark, sound pack or channel — press the key combination to bind, and * choose the edge it triggers on and whether it applies to the active server only. */ -final class HotkeyDialog extends JDialog { +public final class HotkeyDialog extends JDialog { /** * A tree node: a category or group heading ({@code action == null}), an action, or @@ -90,7 +91,7 @@ final class HotkeyDialog extends JDialog { private boolean recording; private boolean confirmed; - HotkeyDialog(Window owner, HotkeyService service, Hotkey existing) { + public HotkeyDialog(Window owner, HotkeyService service, Hotkey existing) { // Any window may open this: the options dialog's hotkey tab as much as a frame. super(owner, existing == null ? "Add hotkey" : "Edit hotkey", ModalityType.APPLICATION_MODAL); this.service = service; @@ -353,11 +354,11 @@ final class HotkeyDialog extends JDialog { dispose(); } - boolean isConfirmed() { + public boolean isConfirmed() { return confirmed; } - Hotkey result() { + public Hotkey result() { return hotkey; } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyService.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyService.java similarity index 87% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyService.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyService.java index eca2ef5..be5cc03 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeyService.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeyService.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.hotkey; import eu.lixko.ts3j.client.hotkey.GlobalInputHook; import eu.lixko.ts3j.client.hotkey.Hotkey; @@ -17,7 +17,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * the platform input hook they are fed from. Everything the dialogs need — recording a * combination, naming keys, telling the user why hotkeys are dead — goes through here. */ -final class HotkeyService { +public final class HotkeyService { private final Hotkeys hotkeys = Hotkeys.load(); private final HotkeyEngine engine; @@ -25,7 +25,7 @@ final class HotkeyService { private final HotkeyArguments arguments; private final List keyPressListeners = new CopyOnWriteArrayList<>(); - HotkeyService(HotkeyEngine.Handler handler, HotkeyArguments arguments) { + public HotkeyService(HotkeyEngine.Handler handler, HotkeyArguments arguments) { this.arguments = arguments; engine = new HotkeyEngine(hotkeys, handler); hook = DesktopInputHooks.start((key, pressed) -> { @@ -40,11 +40,11 @@ final class HotkeyService { * Runs {@code l} on the input hook's thread for every key going down anywhere on the * system, which is what typing attenuation listens for. Keep it cheap. */ - void addKeyPressListener(Runnable l) { + public void addKeyPressListener(Runnable l) { keyPressListeners.add(l); } - void removeKeyPressListener(Runnable l) { + public void removeKeyPressListener(Runnable l) { keyPressListeners.remove(l); } @@ -58,18 +58,18 @@ final class HotkeyService { } } - List all() { + public List all() { return hotkeys.all(); } - void replaceAll(List updated) { + public void replaceAll(List updated) { engine.releaseAll(); hotkeys.replaceAll(updated); hotkeys.save(); } /** The binding for an action with no argument, or {@code null} when unbound. */ - Hotkey find(HotkeyAction action) { + public Hotkey find(HotkeyAction action) { for (Hotkey h : hotkeys.all()) { if (h.action == action) return h; } @@ -87,7 +87,7 @@ final class HotkeyService { : "Global hotkeys are unavailable (" + hook.unavailableReason() + ")."; } - String display(HotkeyCombo combo) { + public String display(HotkeyCombo combo) { return combo == null ? "No hotkey assigned" : combo.display(this::keyName); } @@ -104,7 +104,7 @@ final class HotkeyService { engine.stopRecording(); } - void dispose() { + public void dispose() { engine.releaseAll(); hook.close(); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeysPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeysPanel.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeysPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeysPanel.java index 00401de..79186c7 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/HotkeysPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/hotkey/HotkeysPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.hotkey; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -25,7 +25,7 @@ import java.util.List; * and remove them. Edits happen on a working copy and only reach the running engine * when the dialog is applied. */ -final class HotkeysPanel extends JPanel { +public final class HotkeysPanel extends JPanel { private static final String[] COLUMNS = {"Action", "Hotkey", "Trigger", "Active server", "On"}; @@ -34,7 +34,7 @@ final class HotkeysPanel extends JPanel { private final Model model = new Model(); private final JTable table = new JTable(model); - HotkeysPanel(HotkeyService service) { + public HotkeysPanel(HotkeyService service) { super(new BorderLayout(UIScale.scale(6), UIScale.scale(6))); this.service = service; setBorder(new ScaledEmptyBorder(8, 8, 8, 8)); @@ -104,12 +104,12 @@ final class HotkeysPanel extends JPanel { } /** Commits the edited list to the engine and to disk. */ - void apply() { + public void apply() { service.replaceAll(working); } /** Picks the stored bindings up again after something else changed them. */ - void reload() { + public void reload() { working.clear(); for (Hotkey h : service.all()) working.add(h.copy()); model.fireTableDataChanged(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CountryFlagIcons.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/CountryFlagIcons.java similarity index 91% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CountryFlagIcons.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/CountryFlagIcons.java index a6f73f2..e4fad24 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CountryFlagIcons.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/CountryFlagIcons.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.icons; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.gfx.CountryFlags; @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; /** TeamSpeak's country flags as Swing icons, at their own 16×11 scaled with the interface. */ -final class CountryFlagIcons { +public final class CountryFlagIcons { private static final int WIDTH = 16; private static final int HEIGHT = 11; @@ -20,7 +20,7 @@ final class CountryFlagIcons { } /** @return the flag, or {@code null} for an unknown or empty code */ - static ImageIcon of(String code) { + public static ImageIcon of(String code) { if (code == null || code.isEmpty()) return null; return ICONS.computeIfAbsent(code, CountryFlagIcons::load).orElse(null); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/GroupIcons.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/GroupIcons.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/GroupIcons.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/GroupIcons.java index c17bf53..f0816c1 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/GroupIcons.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/GroupIcons.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.icons; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.Group; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconFiles.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconFiles.java similarity index 93% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconFiles.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconFiles.java index f7862ff..836a34c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconFiles.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconFiles.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.icons; import javax.imageio.ImageIO; import javax.swing.ImageIcon; @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; * Icons of the active pack, and country flags, as PNG files, for HTML views, which only * show pictures by URL. A pack change gives the theme new icons, and so new files. */ -final class IconFiles { +public final class IconFiles { private static final Map FILES = new ConcurrentHashMap<>(); private static File dir; @@ -23,7 +23,7 @@ final class IconFiles { } /** @return the icon's file, or {@code null} if no pack has it or it could not be written */ - static File of(String key, int size) { + public static File of(String key, int size) { ImageIcon icon = IconTheme.icon(key, size); if (icon == null) return null; String name = key + '_' + size + '_' + Integer.toHexString(System.identityHashCode(icon)) + ".png"; @@ -32,7 +32,7 @@ final class IconFiles { } /** @return the country's flag as drawn in the tree, or {@code null} for none */ - static File flag(String code) { + public static File flag(String code) { ImageIcon icon = CountryFlagIcons.of(code); if (icon == null) return null; File file = FILES.computeIfAbsent("flag_" + code + '_' + icon.getIconWidth() + ".png", n -> write(icon, n)); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconTheme.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconTheme.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconTheme.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconTheme.java index b76bd0b..2096aa4 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IconTheme.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/IconTheme.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.icons; import com.formdev.flatlaf.util.UIScale; import com.github.weisj.jsvg.SVGDocument; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Icons.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/Icons.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Icons.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/Icons.java index 31f150e..12ec8ca 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Icons.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/icons/Icons.java @@ -1,7 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.icons; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.gfx.IconKeys; +import eu.lixko.ts3j.client.ui.Theme; import javax.swing.ImageIcon; import java.awt.BasicStroke; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractListEditorDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AbstractListEditorDialog.java similarity index 94% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractListEditorDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AbstractListEditorDialog.java index fb87ac0..2e0861a 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AbstractListEditorDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AbstractListEditorDialog.java @@ -1,7 +1,10 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.admin.ReasonDialog; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; @@ -29,7 +32,7 @@ import java.util.List; * A small modal editor for a list of text-keyed items: Add, Remove, optionally Move up and * down, and OK/Cancel. Edits a copy and writes it back only on OK. */ -abstract class AbstractListEditorDialog extends JDialog { +public abstract class AbstractListEditorDialog extends JDialog { protected final DefaultListModel model = new DefaultListModel<>(); protected final JList list = new JList<>(model); @@ -42,7 +45,7 @@ abstract class AbstractListEditorDialog extends JDialog { * @param itemPrompt what Add and a double-click ask for * @param movable whether the order matters, offering Move up and down */ - AbstractListEditorDialog(Window owner, String title, String intro, String itemPrompt, List items, boolean movable) { + public AbstractListEditorDialog(Window owner, String title, String intro, String itemPrompt, List items, boolean movable) { super(owner, title, ModalityType.APPLICATION_MODAL); this.itemPrompt = itemPrompt; items.forEach(model::addElement); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AwayMessagesDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AwayMessagesDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AwayMessagesDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AwayMessagesDialog.java index 45b0c90..d1d5196 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AwayMessagesDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/AwayMessagesDialog.java @@ -1,8 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.AwayMessages; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BookmarksDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/BookmarksDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BookmarksDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/BookmarksDialog.java index 52cd3ad..30625aa 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/BookmarksDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/BookmarksDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -10,6 +10,9 @@ import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.session.Sessions; import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter; import eu.lixko.ts3j.client.teamspeak.TeamSpeakSettingsDb; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ConnectDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ConnectDialog.java index 599cbc1..a655361 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ConnectDialog.java @@ -1,9 +1,10 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.IdentityStore; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.JButton; import javax.swing.JDialog; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactDefaultsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactDefaultsDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactDefaultsDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactDefaultsDialog.java index f72bead..b913965 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactDefaultsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactDefaultsDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -6,6 +6,8 @@ import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.contacts.ContactDefaults; import eu.lixko.ts3j.client.contacts.ContactType; import eu.lixko.ts3j.client.contacts.NicknameDisplay; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -34,7 +36,7 @@ import java.util.function.Function; * when added as a friend, blocked or neutral — the ignore/hide flags and how its * nickname is displayed — in a grid with one column per contact type. */ -final class ContactDefaultsDialog extends JDialog { +public final class ContactDefaultsDialog extends JDialog { private static final ContactType[] COLUMNS = {ContactType.FRIEND, ContactType.BLOCKED, ContactType.NEUTRAL}; @@ -42,7 +44,7 @@ final class ContactDefaultsDialog extends JDialog { private final Map> flags = new EnumMap<>(ContactType.class); private final Map> displays = new EnumMap<>(ContactType.class); - ContactDefaultsDialog(Dialog owner, Settings settings) { + public ContactDefaultsDialog(Dialog owner, Settings settings) { super(owner, "Contact Manager Default Settings", true); this.settings = settings; for (ContactType t : COLUMNS) { diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactsDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactsDialog.java index 9697d5c..9e449bd 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/ContactsDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -9,6 +9,9 @@ import eu.lixko.ts3j.client.contacts.ContactType; import eu.lixko.ts3j.client.contacts.NicknameDisplay; import eu.lixko.ts3j.client.teamspeak.TeamSpeakSettingsDb; import eu.lixko.ts3j.client.text.TsLink; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.BorderFactory; import javax.swing.Box; @@ -69,7 +72,7 @@ import java.util.regex.Pattern; *

Clients can be dragged in from the server tree — the drag carries the * client's TS3 link, which names its unique id. */ -final class ContactsDialog extends JDialog { +public final class ContactsDialog extends JDialog { private static final DateTimeFormatter SEEN = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); private static final DateTimeFormatter SEEN_DAY = DateTimeFormatter.ofPattern("yyyy-MM-dd"); @@ -108,7 +111,7 @@ final class ContactsDialog extends JDialog { /** Set while the fields are being filled from a contact, so that does not count as an edit. */ private boolean filling; - ContactsDialog(Frame owner, ContactStore contacts, Settings settings) { + public ContactsDialog(Frame owner, ContactStore contacts, Settings settings) { super(owner, "Contacts", false); this.contacts = contacts; this.settings = settings; @@ -234,7 +237,7 @@ final class ContactsDialog extends JDialog { } /** Selects the contact a client's unique id (or a contact key) is filed under, if it is on the list. */ - void select(String uniqueId) { + public void select(String uniqueId) { Contact wanted = contacts.find(uniqueId); if (wanted == null) return; java.util.Enumeration nodes = root.depthFirstEnumeration(); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentitiesDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentitiesDialog.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentitiesDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentitiesDialog.java index 1284a6a..2ea9b80 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentitiesDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentitiesDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -8,6 +8,7 @@ import eu.lixko.ts3j.client.config.IdentityStore; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter; import eu.lixko.ts3j.client.teamspeak.TeamSpeakSettingsDb; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentityChooser.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentityChooser.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentityChooser.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentityChooser.java index 5a69f70..6c509fc 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/IdentityChooser.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/manage/IdentityChooser.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.manage; import eu.lixko.ts3j.client.config.IdentityEntry; import eu.lixko.ts3j.client.config.IdentityStore; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ApplicationPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ApplicationPanel.java similarity index 92% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ApplicationPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ApplicationPanel.java index c805a09..1c250fa 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ApplicationPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ApplicationPanel.java @@ -1,6 +1,7 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JCheckBox; import java.awt.GridBagConstraints; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AudioDevices.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/AudioDevices.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AudioDevices.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/AudioDevices.java index d717946..b3e64b6 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AudioDevices.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/AudioDevices.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.audio.AudioDevice; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CapturePanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/CapturePanel.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CapturePanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/CapturePanel.java index c629c75..87dc4ea 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/CapturePanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/CapturePanel.java @@ -1,9 +1,12 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.audio.AudioBackend; import eu.lixko.ts3j.client.audio.AudioDevice; import eu.lixko.ts3j.client.audio.VoiceInput; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyService; +import eu.lixko.ts3j.client.ui.hotkey.HotkeysPanel; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JCheckBox; import javax.swing.JComboBox; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatLogsPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ChatLogsPanel.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatLogsPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ChatLogsPanel.java index fb605d7..d021376 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChatLogsPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ChatLogsPanel.java @@ -1,8 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.AppDirs; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JButton; import javax.swing.JCheckBox; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVersionPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ClientVersionPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVersionPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ClientVersionPanel.java index a5a1f37..98f6f2f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVersionPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ClientVersionPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.ClientVersion; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ContactsPanel.java similarity index 95% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ContactsPanel.java index e1f10c3..f86ac99 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ContactsPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/ContactsPanel.java @@ -1,6 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.manage.ContactDefaultsDialog; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesignPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/DesignPanel.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesignPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/DesignPanel.java index 4e9c9de..358f3a4 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DesignPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/DesignPanel.java @@ -1,9 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.gfx.IconPack; +import eu.lixko.ts3j.client.ui.DisplayScale; +import eu.lixko.ts3j.client.ui.LookAndFeelManager; +import eu.lixko.ts3j.client.ui.icons.IconTheme; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LevelMeter.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/LevelMeter.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LevelMeter.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/LevelMeter.java index f90fd9b..3b87dd6 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/LevelMeter.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/LevelMeter.java @@ -1,6 +1,7 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.UIScale; +import eu.lixko.ts3j.client.ui.Theme; import javax.swing.JComponent; import java.awt.Color; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MicrophoneTest.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MicrophoneTest.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MicrophoneTest.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MicrophoneTest.java index 2560857..4ae8ef6 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MicrophoneTest.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MicrophoneTest.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.audio.AudioBackend; import eu.lixko.ts3j.client.audio.AudioPlayback; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MyTeamSpeakPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MyTeamSpeakPanel.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MyTeamSpeakPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MyTeamSpeakPanel.java index 9741555..a864dbc 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/MyTeamSpeakPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/MyTeamSpeakPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -9,6 +9,7 @@ import eu.lixko.ts3j.client.myts.MyTeamSpeakLogin; import eu.lixko.ts3j.client.myts.MyTsException; import eu.lixko.ts3j.client.teamspeak.SyncItem; import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.Box; import javax.swing.BoxLayout; @@ -39,7 +40,7 @@ import java.util.stream.Stream; * account synchronises and import it. Everything here takes effect at once rather * than on OK, as signing in is not a setting to be cancelled. */ -final class MyTeamSpeakPanel extends JPanel { +public final class MyTeamSpeakPanel extends JPanel { private static final String SIGNED_OUT = "out"; private static final String SIGNED_IN = "in"; @@ -70,7 +71,7 @@ final class MyTeamSpeakPanel extends JPanel { private List accountItems = List.of(); private boolean fetched; - MyTeamSpeakPanel(MyTeamSpeakLogin login, TeamSpeakImporter importer, Runnable onImported, + public MyTeamSpeakPanel(MyTeamSpeakLogin login, TeamSpeakImporter importer, Runnable onImported, Runnable onSignInChanged) { this.login = login; this.importer = importer; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NetworkPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NetworkPanel.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NetworkPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NetworkPanel.java index 174e8a6..d387ef4 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NetworkPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NetworkPanel.java @@ -1,7 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.audio.VoiceInput; import eu.lixko.ts3j.client.config.Settings; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JCheckBox; import javax.swing.JLabel; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NotificationsPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NotificationsPanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NotificationsPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NotificationsPanel.java index 210b1de..1b9c209 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NotificationsPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/NotificationsPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsPage.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsPage.java similarity index 89% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsPage.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsPage.java index 5406f27..d584a05 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsPage.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsPage.java @@ -1,4 +1,6 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; + +import eu.lixko.ts3j.client.ui.icons.IconTheme; import javax.swing.ImageIcon; import javax.swing.JComponent; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsSidebar.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsSidebar.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsSidebar.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsSidebar.java index 1df0598..b88d62a 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/OptionsSidebar.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/OptionsSidebar.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PlaybackPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/PlaybackPanel.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PlaybackPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/PlaybackPanel.java index 4f76a82..de70826 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/PlaybackPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/PlaybackPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import eu.lixko.ts3j.client.audio.AudioDevice; import eu.lixko.ts3j.client.audio.AudioIo; @@ -6,6 +6,7 @@ import eu.lixko.ts3j.client.audio.VoiceOutput; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.sound.SoundEvent; import eu.lixko.ts3j.client.sound.SoundNotifier; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JButton; import javax.swing.JComboBox; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RowColorCombo.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/RowColorCombo.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RowColorCombo.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/RowColorCombo.java index 81b59fb..7fcad43 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RowColorCombo.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/RowColorCombo.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.ClientRowColors; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SettingsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/SettingsDialog.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SettingsDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/SettingsDialog.java index ff137b0..8f63d3c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SettingsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/SettingsDialog.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -8,6 +8,10 @@ import eu.lixko.ts3j.client.audio.VoiceInput; import eu.lixko.ts3j.client.audio.VoiceOutput; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.sound.SoundNotifier; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyService; +import eu.lixko.ts3j.client.ui.hotkey.HotkeysPanel; +import eu.lixko.ts3j.client.ui.icons.IconTheme; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.JButton; import javax.swing.JComponent; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/VoiceActivationSection.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/VoiceActivationSection.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/VoiceActivationSection.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/VoiceActivationSection.java index d6bfe88..f7bf3e0 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/VoiceActivationSection.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/options/VoiceActivationSection.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -8,6 +8,11 @@ import eu.lixko.ts3j.client.audio.VoiceInput; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.hotkey.Hotkey; import eu.lixko.ts3j.client.hotkey.HotkeyAction; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyDialog; +import eu.lixko.ts3j.client.ui.hotkey.HotkeyService; +import eu.lixko.ts3j.client.ui.hotkey.HotkeysPanel; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.ButtonGroup; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/AvatarActions.java similarity index 94% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarActions.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/AvatarActions.java index 15f89c8..dcfb762 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/AvatarActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/AvatarActions.java @@ -1,8 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.net.ClientEntry; -import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.net.avatar.Avatar; +import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -14,7 +15,7 @@ import java.nio.file.Files; import java.util.concurrent.CompletableFuture; /** Sets, takes and deletes our avatar on one server, reporting failures in a dialog. */ -final class AvatarActions { +public final class AvatarActions { /** Where the last avatar was picked from, for every server alike. */ private static File lastDirectory; @@ -28,7 +29,7 @@ final class AvatarActions { } /** Asks for an image and uploads it as our avatar. */ - void choose() { + public void choose() { if (!session.isConnected()) return; JFileChooser chooser = new JFileChooser(lastDirectory); chooser.setDialogTitle("Select your avatar"); @@ -55,7 +56,7 @@ final class AvatarActions { Edt.onFailure(upload, failure -> show("Error uploading avatar: " + failure.getMessage())); } - void delete() { + public void delete() { if (!session.isConnected()) return; Edt.onFailure(session.avatarAdmin().remove(), failure -> show("Error deleting avatar: " + failure.getMessage())); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ChannelMenu.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ChannelMenu.java index 06b585c..ef4c609 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ChannelMenu.java @@ -1,7 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.net.ChannelSettings; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientMenu.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientMenu.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientMenu.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientMenu.java index a03c88e..54d0ac2 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientMenu.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientMenu.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.contacts.ContactType; import eu.lixko.ts3j.client.net.ChannelNode; @@ -6,6 +6,8 @@ import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.Group; import eu.lixko.ts3j.client.net.GroupChoice; import eu.lixko.ts3j.client.net.ServerModel; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenu; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientSelectionModel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientSelectionModel.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientSelectionModel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientSelectionModel.java index 5fa557f..c609e7b 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientSelectionModel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientSelectionModel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.net.ClientEntry; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVolumeDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientVolumeDialog.java similarity index 93% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVolumeDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientVolumeDialog.java index 879a3f2..e55d308 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ClientVolumeDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ClientVolumeDialog.java @@ -1,9 +1,13 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ClientContacts; import eu.lixko.ts3j.client.net.ClientEntry; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.chat.HtmlStyles; +import eu.lixko.ts3j.client.ui.widget.Dialogs; +import eu.lixko.ts3j.client.ui.widget.FormPanel; import javax.swing.JButton; import javax.swing.JDialog; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectionInfoDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ConnectionInfoDialog.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectionInfoDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ConnectionInfoDialog.java index 2339d8b..cb06ba3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ConnectionInfoDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ConnectionInfoDialog.java @@ -1,14 +1,18 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.ConnectionStats; -import eu.lixko.ts3j.client.net.ConnectionStatsFormat; import eu.lixko.ts3j.client.net.ConnectionStatsFormat.Row; import eu.lixko.ts3j.client.net.ConnectionStatsFormat.TrafficRow; -import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.net.ConnectionStatsFormat; import eu.lixko.ts3j.client.net.avatar.Avatar; +import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.chat.AvatarHtml; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Dialogs; import javax.swing.Box; import javax.swing.BoxLayout; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropIndicatorTree.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/DropIndicatorTree.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropIndicatorTree.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/DropIndicatorTree.java index aa14474..a07657f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropIndicatorTree.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/DropIndicatorTree.java @@ -1,12 +1,16 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.net.ChannelNode; -import eu.lixko.ts3j.client.net.Spacers; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.ClientStatus; import eu.lixko.ts3j.client.net.ServerModel; +import eu.lixko.ts3j.client.net.Spacers; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.CountryFlagIcons; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.Icon; import javax.swing.JTree; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FileBrowserDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/FileBrowserDialog.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FileBrowserDialog.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/FileBrowserDialog.java index 261466b..53459ab 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FileBrowserDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/FileBrowserDialog.java @@ -1,12 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ChannelNode; -import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.net.filetransfer.FileTransfer; import eu.lixko.ts3j.client.net.filetransfer.RemoteFile; +import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.text.ByteSize; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.BorderFactory; import javax.swing.Box; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/InfoPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/InfoPanel.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/InfoPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/InfoPanel.java index 3eed1da..411bddd 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/InfoPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/InfoPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -13,6 +13,14 @@ import eu.lixko.ts3j.client.net.PictureDownloads; import eu.lixko.ts3j.client.net.ServerModel; import eu.lixko.ts3j.client.net.avatar.Avatar; import eu.lixko.ts3j.client.text.BBCode; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.chat.AvatarHtml; +import eu.lixko.ts3j.client.ui.chat.DescriptionPictures; +import eu.lixko.ts3j.client.ui.chat.HtmlStyles; +import eu.lixko.ts3j.client.ui.chat.Links; +import eu.lixko.ts3j.client.ui.chat.TextZoom; +import eu.lixko.ts3j.client.ui.icons.IconFiles; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.BorderFactory; import javax.swing.JEditorPane; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NicknameCellEditor.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/NicknameCellEditor.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NicknameCellEditor.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/NicknameCellEditor.java index 35de03a..dc712a1 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/NicknameCellEditor.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/NicknameCellEditor.java @@ -1,7 +1,8 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.net.ClientEntry; +import eu.lixko.ts3j.client.ui.Theme; import javax.swing.DefaultCellEditor; import javax.swing.JLabel; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RecordingActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/RecordingActions.java similarity index 87% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RecordingActions.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/RecordingActions.java index 6a39a44..56d5d84 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/RecordingActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/RecordingActions.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.recording.VoiceRecorder; @@ -13,18 +13,18 @@ import java.nio.file.Path; import java.nio.file.Paths; /** Starts recordings, into a file the user picks or, from a hotkey, the folder last used. */ -final class RecordingActions { +public final class RecordingActions { private final Component owner; private final Settings settings; - RecordingActions(Component owner, Settings settings) { + public RecordingActions(Component owner, Settings settings) { this.owner = owner; this.settings = settings; } /** Asks where to save, then starts recording. */ - void choose(ServerSession session, boolean multitrack) { + public void choose(ServerSession session, boolean multitrack) { if (!session.isConnected() || session.isRecording()) return; Path dir = settings.recordingFolder(); if (!Files.isDirectory(dir)) dir = Paths.get(System.getProperty("user.home", ".")); @@ -40,7 +40,7 @@ final class RecordingActions { session.startRecording(mode(multitrack), file.toPath()); } - void startNow(ServerSession session, boolean multitrack) { + public void startNow(ServerSession session, boolean multitrack) { if (!session.isConnected() || session.isRecording()) return; session.startRecording(mode(multitrack), session.recordingFile(settings.recordingFolder())); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerMenu.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerMenu.java similarity index 91% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerMenu.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerMenu.java index 31dfce6..69bc9d2 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerMenu.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerMenu.java @@ -1,6 +1,7 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.net.ChannelSettings; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTab.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTab.java similarity index 89% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTab.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTab.java index 747adc7..acbdf68 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTab.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTab.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.audio.AudioBackend; import eu.lixko.ts3j.client.config.BanReasonPresets; @@ -13,6 +13,20 @@ import eu.lixko.ts3j.client.net.avatar.Avatar; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.sound.SoundNotifier; import eu.lixko.ts3j.client.text.TsLink; +import eu.lixko.ts3j.client.ui.MainFrame; +import eu.lixko.ts3j.client.ui.admin.AbstractServerListDialog; +import eu.lixko.ts3j.client.ui.admin.BanListDialog; +import eu.lixko.ts3j.client.ui.admin.ComplaintsDialog; +import eu.lixko.ts3j.client.ui.admin.OfflineMessageComposeDialog; +import eu.lixko.ts3j.client.ui.admin.OfflineMessagesDialog; +import eu.lixko.ts3j.client.ui.admin.PrivilegeKeysDialog; +import eu.lixko.ts3j.client.ui.admin.ServerLogDialog; +import eu.lixko.ts3j.client.ui.chat.ChatAttachmentActions; +import eu.lixko.ts3j.client.ui.chat.ChatPanel; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Edt; +import eu.lixko.ts3j.client.ui.widget.SplitRatio; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -32,7 +46,7 @@ import java.util.function.Supplier; * ServerTab owns the panels, tree context-menu actions and selection live in * {@link ServerTabTreeActions}, and session callbacks in {@link ServerTabConnectionEvents}. */ -final class ServerTab { +public final class ServerTab { private final MainFrame host; private final Settings settings; @@ -56,7 +70,7 @@ final class ServerTab { /** The unread count last reported, to tell new mail from messages being read. */ private int unreadMessages; - ServerTab(MainFrame host, Settings settings, IdentityStore identities, AudioBackend audio, + public ServerTab(MainFrame host, Settings settings, IdentityStore identities, AudioBackend audio, SoundNotifier sounds, ContactStore contacts, PictureDownloads pictures) { this.host = host; this.settings = settings; @@ -163,36 +177,36 @@ final class ServerTab { // ---- accessors ---- - JComponent component() { + public JComponent component() { return component; } - ServerSession session() { + public ServerSession session() { return session; } - ChatPanel chat() { + public ChatPanel chat() { return chatPanel; } /** Opens the server's ban list, or brings the already open one forward. */ - void showBanList(BanReasonPresets presets) { + public void showBanList(BanReasonPresets presets) { showListWindow(BanListDialog.class, () -> new BanListDialog(host, session, settings, presets)); } - void showComplaints() { + public void showComplaints() { showListWindow(ComplaintsDialog.class, () -> new ComplaintsDialog(host, session, treeActions::banClient)); } - void showServerLog() { + public void showServerLog() { showListWindow(ServerLogDialog.class, () -> new ServerLogDialog(host, session, settings)); } - void showPrivilegeKeys() { + public void showPrivilegeKeys() { showListWindow(PrivilegeKeysDialog.class, () -> new PrivilegeKeysDialog(host, session, groupIcons)); } - void showOfflineMessages() { + public void showOfflineMessages() { showListWindow(OfflineMessagesDialog.class, () -> new OfflineMessagesDialog(host, session, new OfflineMessagesDialog.Composer() { @Override @@ -243,7 +257,7 @@ final class ServerTab { } /** Asks for a privilege key and redeems it on this server. */ - void usePrivilegeKey() { + public void usePrivilegeKey() { if (!session.isConnected()) return; String key = (String) JOptionPane.showInputDialog(host, "Privilege Key:", "Use Privilege Key", JOptionPane.PLAIN_MESSAGE, Icons.of("TOKEN_USE"), null, null); @@ -265,7 +279,7 @@ final class ServerTab { } /** The contact list changed: names, colours and per-client playback follow. */ - void contactsChanged() { + public void contactsChanged() { session.contacts().applyAll(); treePanel.refreshRowSizes(); treeActions.renderInfo(); @@ -273,14 +287,14 @@ final class ServerTab { // ---- dialogs ---- - AvatarActions avatar() { + public AvatarActions avatar() { return avatar; } // ---- chat ---- /** Opens the file repository browser for a channel, as the "Browse Files" hotkey/menu action does. */ - void browseFiles(ChannelNode channel) { + public void browseFiles(ChannelNode channel) { treeActions.browseFiles(channel); } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabConnectionEvents.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabConnectionEvents.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabConnectionEvents.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabConnectionEvents.java index 82b08eb..121d6d3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabConnectionEvents.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabConnectionEvents.java @@ -1,7 +1,9 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.chat.ChatKey; import eu.lixko.ts3j.client.session.ServerSession; +import eu.lixko.ts3j.client.ui.MainFrame; +import eu.lixko.ts3j.client.ui.chat.ChatPanel; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabTreeActions.java similarity index 96% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabTreeActions.java index aef744d..b032494 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTabTreeActions.java @@ -1,16 +1,25 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.audio.VoiceOutput; import eu.lixko.ts3j.client.contacts.ContactType; -import eu.lixko.ts3j.client.net.ClientAdmin; import eu.lixko.ts3j.client.net.ChannelNode; -import eu.lixko.ts3j.client.net.Spacers; import eu.lixko.ts3j.client.net.ChannelSettings; +import eu.lixko.ts3j.client.net.ClientAdmin; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.ComplaintAdmin; import eu.lixko.ts3j.client.net.Group; +import eu.lixko.ts3j.client.net.Spacers; import eu.lixko.ts3j.client.session.ServerSession; import eu.lixko.ts3j.client.text.TsLink; +import eu.lixko.ts3j.client.ui.MainFrame; +import eu.lixko.ts3j.client.ui.admin.BanDialog; +import eu.lixko.ts3j.client.ui.admin.ReasonDialog; +import eu.lixko.ts3j.client.ui.admin.ServerGroupsDialog; +import eu.lixko.ts3j.client.ui.channel.ChannelDialog; +import eu.lixko.ts3j.client.ui.chat.ChatPanel; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.Edt; import javax.swing.JOptionPane; import java.awt.Component; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeCellRenderer.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeCellRenderer.java similarity index 97% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeCellRenderer.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeCellRenderer.java index 67751ed..99207d3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeCellRenderer.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeCellRenderer.java @@ -1,12 +1,14 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.contacts.Contact; import eu.lixko.ts3j.client.contacts.ContactStore; import eu.lixko.ts3j.client.net.ChannelNode; -import eu.lixko.ts3j.client.net.Spacers; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.ClientStatus; +import eu.lixko.ts3j.client.net.Spacers; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.Icons; import javax.swing.ImageIcon; import javax.swing.JTree; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeDragAndDrop.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeDragAndDrop.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeDragAndDrop.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeDragAndDrop.java index b837bf1..eb7c5de 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeDragAndDrop.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeDragAndDrop.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.net.Spacers; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreePanel.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreePanel.java index eccf1dd..dc2eb07 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreePanel.java @@ -1,15 +1,17 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.config.Settings; import eu.lixko.ts3j.client.contacts.ContactStore; import eu.lixko.ts3j.client.contacts.ContactType; import eu.lixko.ts3j.client.net.ChannelNode; -import eu.lixko.ts3j.client.net.Spacers; import eu.lixko.ts3j.client.net.ChannelSettings; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.Group; import eu.lixko.ts3j.client.net.ServerModel; +import eu.lixko.ts3j.client.net.Spacers; +import eu.lixko.ts3j.client.ui.Theme; +import eu.lixko.ts3j.client.ui.icons.GroupIcons; import javax.swing.AbstractAction; import javax.swing.DropMode; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeSearch.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeSearch.java similarity index 98% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeSearch.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeSearch.java index 4285cb3..86822a3 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreeSearch.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/server/ServerTreeSearch.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.server; import eu.lixko.ts3j.client.contacts.Contact; import eu.lixko.ts3j.client.contacts.ContactStore; @@ -6,6 +6,8 @@ import eu.lixko.ts3j.client.net.ChannelNode; import eu.lixko.ts3j.client.net.ClientEntry; import eu.lixko.ts3j.client.net.TreeMatch; import eu.lixko.ts3j.client.text.TextQuery; +import eu.lixko.ts3j.client.ui.icons.Icons; +import eu.lixko.ts3j.client.ui.widget.FindBar; import javax.swing.Icon; import javax.swing.JButton; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Dialogs.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Dialogs.java similarity index 86% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Dialogs.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Dialogs.java index 48d2d68..b23cec9 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Dialogs.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Dialogs.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import javax.swing.AbstractAction; import javax.swing.JComponent; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; /** Behaviour shared by the client's dialogs. */ -final class Dialogs { +public final class Dialogs { private Dialogs() { } @@ -22,7 +22,7 @@ final class Dialogs { * component claims Escape first, which is what leaves a table's or combo * box's own "cancel the edit" behaviour intact. */ - static void closeOnEscape(JDialog dialog) { + public static void closeOnEscape(JDialog dialog) { closeOnEscape(dialog, dialog::dispose); } @@ -30,7 +30,7 @@ final class Dialogs { * Binds Escape to the dialog's own way of closing, for dialogs that have to * tidy up (or discard edits) on the way out. */ - static void closeOnEscape(JDialog dialog, Runnable close) { + public static void closeOnEscape(JDialog dialog, Runnable close) { JRootPane root = dialog.getRootPane(); root.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "ts3-close"); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropDownToggleButton.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/DropDownToggleButton.java similarity index 99% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropDownToggleButton.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/DropDownToggleButton.java index 8bcc9e2..60dbbf8 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/DropDownToggleButton.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/DropDownToggleButton.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import com.formdev.flatlaf.util.UIScale; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Edt.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Edt.java similarity index 57% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Edt.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Edt.java index c7584c4..87c3e6c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/Edt.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/Edt.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import eu.lixko.ts3j.client.net.Replies; import eu.lixko.ts3j.client.net.RequestException; @@ -8,20 +8,20 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; /** {@link Replies} on the event dispatch thread. */ -final class Edt { +public final class Edt { private Edt() { } - static void handle(CompletableFuture request, Consumer onSuccess, Consumer onFailure) { + public static void handle(CompletableFuture request, Consumer onSuccess, Consumer onFailure) { Replies.handle(request, SwingUtilities::invokeLater, onSuccess, onFailure); } - static void handle(CompletableFuture request, Runnable onSuccess, Consumer onFailure) { + public static void handle(CompletableFuture request, Runnable onSuccess, Consumer onFailure) { Replies.handle(request, SwingUtilities::invokeLater, onSuccess, onFailure); } - static void onFailure(CompletableFuture request, Consumer onFailure) { + public static void onFailure(CompletableFuture request, Consumer onFailure) { Replies.onFailure(request, SwingUtilities::invokeLater, onFailure); } } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FindBar.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FindBar.java similarity index 95% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FindBar.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FindBar.java index e16ca9c..6bde4aa 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FindBar.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FindBar.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.icons.FlatAbstractIcon; @@ -6,6 +6,7 @@ import com.formdev.flatlaf.icons.FlatSearchIcon; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; import eu.lixko.ts3j.client.text.TextQuery; +import eu.lixko.ts3j.client.ui.Theme; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -46,9 +47,9 @@ import java.util.function.BooleanSupplier; * match, Shift+Enter / Shift+F3 to the previous one. Escape first resets the bar (text * and every option) and closes it only once there is nothing left to reset. */ -final class FindBar extends JPanel { +public final class FindBar extends JPanel { - interface Listener { + public interface Listener { void queryChanged(TextQuery query); void next(); @@ -93,7 +94,7 @@ final class FindBar extends JPanel { private final List optionDefaults = new ArrayList<>(); private final List optionResets = new ArrayList<>(); - FindBar(Listener listener) { + public FindBar(Listener listener) { super(new BorderLayout(UIScale.scale(2), 0)); this.listener = listener; setBorder(new ScaledEmptyBorder(4, 4, 4, 4)); @@ -158,7 +159,7 @@ final class FindBar extends JPanel { } /** Adds a view-specific control in front of the field; one that changes the query should call {@link #fireQueryChanged()}. */ - void addLeading(JComponent c) { + public void addLeading(JComponent c) { if (c instanceof AbstractButton b) { b.setFocusable(false); b.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); @@ -168,7 +169,7 @@ final class FindBar extends JPanel { } /** Adds the "show only matches" toggle: a funnel that turns from grey to the accent colour when on. */ - JToggleButton addFilterToggle(String tooltip) { + public JToggleButton addFilterToggle(String tooltip) { JToggleButton filter = new JToggleButton(new Glyph(Glyph.FILTER)); filter.setToolTipText(tooltip); filter.addActionListener(e -> fireQueryChanged()); @@ -181,7 +182,7 @@ final class FindBar extends JPanel { * Lets Escape reset a view-specific option. {@code reset} only puts the option back; * the bar re-runs the query itself afterwards. */ - void addResettable(BooleanSupplier isDefault, Runnable reset) { + public void addResettable(BooleanSupplier isDefault, Runnable reset) { optionDefaults.add(isDefault); optionResets.add(reset); } @@ -209,12 +210,12 @@ final class FindBar extends JPanel { fireQueryChanged(); } - void setPlaceholder(String text) { + public void setPlaceholder(String text) { field.putClientProperty(FlatClientProperties.PLACEHOLDER_TEXT, text); } /** Shows the bar (if hidden) and puts the cursor in the field with its text selected. */ - void open() { + public void open() { if (!isVisible()) { setVisible(true); revalidate(); @@ -232,11 +233,11 @@ final class FindBar extends JPanel { listener.closed(); } - boolean isOpen() { + public boolean isOpen() { return isVisible(); } - TextQuery query() { + public TextQuery query() { return isVisible() ? new TextQuery(field.getText(), matchCase.isSelected(), wholeWord.isSelected(), regex.isSelected()) : TextQuery.EMPTY; @@ -250,12 +251,12 @@ final class FindBar extends JPanel { * @param position the 1-based match the view is on, or 0 for none * @param more whether there are more matches than {@code total} */ - void setCount(int position, int total, boolean more) { + public void setCount(int position, int total, boolean more) { showStatus((position > 0 ? String.valueOf(position) : " ") + " / " + total + (more ? "+" : ""), total == 0); } /** No query, nothing to count. */ - void clearCount() { + public void clearCount() { showStatus("", false); } @@ -265,13 +266,13 @@ final class FindBar extends JPanel { field.putClientProperty(FlatClientProperties.OUTLINE, noMatch ? FlatClientProperties.OUTLINE_ERROR : null); } - void setNavigable(boolean navigable) { + public void setNavigable(boolean navigable) { previous.setEnabled(navigable); next.setEnabled(navigable); } /** Re-runs the query now, e.g. after an option changed. */ - void fireQueryChanged() { + public void fireQueryChanged() { typing.stop(); TextQuery q = query(); if (q.isInvalid()) { diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FormPanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FormPanel.java similarity index 85% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FormPanel.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FormPanel.java index b451745..e1fb92f 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/FormPanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/FormPanel.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -24,18 +24,18 @@ import java.awt.Rectangle; * demanding its own preferred one, so rows stay inside the dialog instead of scrolling * sideways. Also holds the small GridBagLayout helpers every such tab needs. */ -class FormPanel extends JPanel implements Scrollable { +public class FormPanel extends JPanel implements Scrollable { - static final int FIELD_WIDTH = 240; - static final int SLIDER_WIDTH = 200; + public static final int FIELD_WIDTH = 240; + public static final int SLIDER_WIDTH = 200; static final int MIN_FIELD_WIDTH = 60; - FormPanel() { + public FormPanel() { this(true); } /** @param padded {@code false} for a form embedded in another one, which pads it already */ - FormPanel(boolean padded) { + public FormPanel(boolean padded) { super(new GridBagLayout()); if (padded) setBorder(new ScaledEmptyBorder(12, 12, 12, 12)); } @@ -65,7 +65,7 @@ class FormPanel extends JPanel implements Scrollable { return false; } - static GridBagConstraints gbc() { + public static GridBagConstraints gbc() { GridBagConstraints c = new GridBagConstraints(); c.insets = UIScale.scale(new Insets(4, 4, 4, 4)); c.anchor = GridBagConstraints.WEST; @@ -110,12 +110,12 @@ class FormPanel extends JPanel implements Scrollable { * Adds a {@link #sectionHeader} spanning the grid at {@code row}, with space above it * unless it is the first row; leaves {@code c} as it found it. */ - static void addSection(JPanel p, GridBagConstraints c, int row, String title) { + public static void addSection(JPanel p, GridBagConstraints c, int row, String title) { addSection(p, c, row, title, null); } /** {@link #addSection(JPanel, GridBagConstraints, int, String)} with a {@code trailing} component. */ - static void addSection(JPanel p, GridBagConstraints c, int row, String title, Component trailing) { + public static void addSection(JPanel p, GridBagConstraints c, int row, String title, Component trailing) { Insets insets = c.insets; int width = c.gridwidth; c.gridx = 0; @@ -129,7 +129,7 @@ class FormPanel extends JPanel implements Scrollable { } /** Adds a component spanning the whole grid at {@code row}, such as a check box. */ - static void addWide(JPanel p, GridBagConstraints c, int row, Component comp) { + public static void addWide(JPanel p, GridBagConstraints c, int row, Component comp) { int width = c.gridwidth; c.gridx = 0; c.gridy = row; @@ -144,7 +144,7 @@ class FormPanel extends JPanel implements Scrollable { * Pushes the rows above it to the top of a taller viewport, and gives the field column * the spare width, which a form of only {@link #addWide} rows would otherwise centre. */ - static void addFiller(JPanel p, GridBagConstraints c, int row) { + public static void addFiller(JPanel p, GridBagConstraints c, int row) { c.gridx = 1; c.gridy = row; c.gridwidth = 1; @@ -154,7 +154,7 @@ class FormPanel extends JPanel implements Scrollable { c.weighty = 0; } - static void addRow(JPanel p, GridBagConstraints c, int row, Component label, Component field) { + public static void addRow(JPanel p, GridBagConstraints c, int row, Component label, Component field) { c.gridx = 0; c.gridy = row; c.weightx = 0; @@ -170,13 +170,13 @@ class FormPanel extends JPanel implements Scrollable { * would otherwise force the form past the dialog's edge, where the scroll pane (which * never scrolls horizontally) simply clips them. */ - static void limitWidth(JComponent comp, int preferredWidth) { + public static void limitWidth(JComponent comp, int preferredWidth) { int height = comp.getPreferredSize().height; comp.setPreferredSize(new Dimension(UIScale.scale(preferredWidth), height)); comp.setMinimumSize(new Dimension(UIScale.scale(MIN_FIELD_WIDTH), height)); } - static JPanel sliderWithLabel(JSlider slider, JLabel valueLabel) { + public static JPanel sliderWithLabel(JSlider slider, JLabel valueLabel) { return sliderWithLabel(slider, valueLabel, 56); } @@ -184,7 +184,7 @@ class FormPanel extends JPanel implements Scrollable { * Pairs a slider with its value readout. The readout gets a fixed width wide enough for * the longest value so the slider does not jump around as it is dragged. */ - static JPanel sliderWithLabel(JSlider slider, JLabel valueLabel, int labelWidth) { + public static JPanel sliderWithLabel(JSlider slider, JLabel valueLabel, int labelWidth) { JPanel panel = new JPanel(new BorderLayout(UIScale.scale(6), 0)); limitWidth(slider, SLIDER_WIDTH); panel.add(slider, BorderLayout.CENTER); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SplitRatio.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/SplitRatio.java similarity index 93% rename from ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SplitRatio.java rename to ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/SplitRatio.java index f3f8bf0..5cdcaa9 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/SplitRatio.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/widget/SplitRatio.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.widget; import eu.lixko.ts3j.client.config.Setting; @@ -12,7 +12,7 @@ import java.util.function.BooleanSupplier; * share at the first layout, holds it as the pane grows or shrinks, and saves it when the * user drags the divider. */ -final class SplitRatio { +public final class SplitRatio { private final JSplitPane split; private final Setting saved; @@ -25,7 +25,7 @@ final class SplitRatio { * @param tracking whether the divider is the user's to place right now; while it is not * (a side collapsed, say), moves are neither saved nor corrected */ - static void keep(JSplitPane split, Setting saved, BooleanSupplier tracking) { + public static void keep(JSplitPane split, Setting saved, BooleanSupplier tracking) { new SplitRatio(split, saved, tracking); } diff --git a/ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/app-icon-small.svg b/ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/icons/app-icon-small.svg similarity index 100% rename from ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/app-icon-small.svg rename to ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/icons/app-icon-small.svg diff --git a/ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/app-icon.svg b/ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/icons/app-icon.svg similarity index 100% rename from ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/app-icon.svg rename to ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/icons/app-icon.svg diff --git a/ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/MicrophoneTestTest.java b/ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/options/MicrophoneTestTest.java similarity index 97% rename from ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/MicrophoneTestTest.java rename to ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/options/MicrophoneTestTest.java index 8d8ac4e..f038f08 100644 --- a/ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/MicrophoneTestTest.java +++ b/ts3-client/swing/src/test/java/eu/lixko/ts3j/client/ui/options/MicrophoneTestTest.java @@ -1,4 +1,4 @@ -package eu.lixko.ts3j.client.ui; +package eu.lixko.ts3j.client.ui.options; import org.junit.jupiter.api.Test; diff --git a/ts3-client/tools/AppIcon.java b/ts3-client/tools/AppIcon.java index 9846cc9..d7d6c4b 100644 --- a/ts3-client/tools/AppIcon.java +++ b/ts3-client/tools/AppIcon.java @@ -41,7 +41,7 @@ public class AppIcon { public static void main(String[] args) throws IOException { Path root = Path.of(""); - Path ui = root.resolve("ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui"); + Path ui = root.resolve("ts3-client/swing/src/main/resources/eu/lixko/ts3j/client/ui/icons"); Files.writeString(ui.resolve("app-icon.svg"), svg(path(icon(LARGE), 6))); Files.writeString(ui.resolve("app-icon-small.svg"), svg(path(icon(SMALL), 0.5))); Files.writeString(root.resolve("android/app/src/main/res/drawable/ic_launcher_foreground.xml"),