From cd098955aa3ae171e3ebca998242195ece1eb67a Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Thu, 19 Nov 2026 03:45:05 -0500 Subject: [PATCH] #2696 Change alias 'group' labeling to 'category' to avoid confusing group to mean talkgroup. (#2703) Co-authored-by: denny --- .../dsheirer/gui/playlist/alias/AliasConfigurationEditor.java | 2 +- .../github/dsheirer/gui/playlist/alias/AliasItemEditor.java | 2 +- .../gui/playlist/alias/AliasViewByIdentifierEditor.java | 2 +- .../gui/playlist/alias/AliasViewByRecordingEditor.java | 4 ++-- .../gui/playlist/channel/ChannelConfigurationEditor.java | 4 ++-- .../gui/playlist/streaming/StreamAliasSelectionEditor.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java index 9fdf7aec4..7386267e3 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java @@ -660,7 +660,7 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef nameColumn.setPrefWidth(140); TableColumn groupColumn = new TableColumn(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setPrefWidth(140); diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java index 2515e614e..e69fe8493 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java @@ -1094,7 +1094,7 @@ public class AliasItemEditor extends Editor GridPane.setConstraints(getColorPicker(), 7, row); mTextFieldPane.getChildren().add(getColorPicker()); - Label groupLabel = new Label("Group"); + Label groupLabel = new Label("Category"); groupLabel.setLabelFor(getGroupField()); GridPane.setHalignment(groupLabel, HPos.RIGHT); GridPane.setConstraints(groupLabel, 0, ++row); diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByIdentifierEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByIdentifierEditor.java index 46adf598a..e05136833 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByIdentifierEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByIdentifierEditor.java @@ -243,7 +243,7 @@ public class AliasViewByIdentifierEditor extends VBox aliasColumn.setPrefWidth(200); TableColumn groupColumn = new TableColumn<>(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setPrefWidth(200); diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByRecordingEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByRecordingEditor.java index a7ce7c93b..fe01e1c85 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByRecordingEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasViewByRecordingEditor.java @@ -241,7 +241,7 @@ public class AliasViewByRecordingEditor extends VBox nameColumn.setCellValueFactory(new PropertyValueFactory("name")); TableColumn groupColumn = new TableColumn(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setPrefWidth(200); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); @@ -280,7 +280,7 @@ public class AliasViewByRecordingEditor extends VBox nameColumn.setCellValueFactory(new PropertyValueFactory("name")); TableColumn groupColumn = new TableColumn(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setPrefWidth(200); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); diff --git a/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java index 2bf6d3fc9..39d1574ce 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/channel/ChannelConfigurationEditor.java @@ -694,8 +694,8 @@ public abstract class ChannelConfigurationEditor extends Editor mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases"); mAutoAddTalkerAliasesCheckBox.setDisable(true); mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " + - "the Talker Alias group. Only radio aliases in that group are automatically renamed; existing " + - "radio aliases outside the group are left unchanged. Move an alias out of the Talker Alias group " + + "the Talker Alias category. Only radio aliases in that category are automatically renamed; existing " + + "radio aliases outside the category are left unchanged. Move an alias out of the Talker Alias category " + "to preserve a custom name. Applies when the channel is (re)started.")); mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true)); } diff --git a/src/main/java/io/github/dsheirer/gui/playlist/streaming/StreamAliasSelectionEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/streaming/StreamAliasSelectionEditor.java index 4cdd477fb..2f9205234 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/streaming/StreamAliasSelectionEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/streaming/StreamAliasSelectionEditor.java @@ -225,7 +225,7 @@ public class StreamAliasSelectionEditor extends VBox aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName")); TableColumn groupColumn = new TableColumn(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setPrefWidth(150); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); @@ -270,7 +270,7 @@ public class StreamAliasSelectionEditor extends VBox aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName")); TableColumn groupColumn = new TableColumn(); - groupColumn.setText("Group"); + groupColumn.setText("Category"); groupColumn.setPrefWidth(150); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));