Off unless asked for. The two are meant to run side by side while the operator
+ * compares them against a live session; until that comparison is done, an ordinary start
+ * must behave exactly as it did.
+ */
+ public static final String COMPOSE_MAIN_WINDOW_ARGUMENT = "--compose-main-window";
+
private static volatile CommandLineOptions rememberedOptions = new CommandLineOptions(null);
private final String requestedProfileName;
+ private final boolean composeMainWindowRequested;
+
public CommandLineOptions(final String requestedProfileName) {
+ this(requestedProfileName, false);
+ }
+
+ public CommandLineOptions(
+ final String requestedProfileName,
+ final boolean composeMainWindowRequested) {
+ this.composeMainWindowRequested = composeMainWindowRequested;
this.requestedProfileName = requestedProfileName;
}
@@ -42,6 +60,7 @@ public class CommandLineOptions {
public static CommandLineOptions parse(final List rawArguments) {
String requestedProfileName = null;
+ boolean composeMainWindow = false;
if (rawArguments != null) {
for (int argumentIndex = 0; argumentIndex < rawArguments.size(); argumentIndex++) {
@@ -51,7 +70,9 @@ public class CommandLineOptions {
continue;
}
- if (currentArgument.startsWith(PROFILE_ARGUMENT + "=")) {
+ if (COMPOSE_MAIN_WINDOW_ARGUMENT.equals(currentArgument)) {
+ composeMainWindow = true;
+ } else if (currentArgument.startsWith(PROFILE_ARGUMENT + "=")) {
requestedProfileName = currentArgument.substring(PROFILE_ARGUMENT.length() + 1);
} else if (PROFILE_ARGUMENT.equals(currentArgument)
&& argumentIndex + 1 < rawArguments.size()) {
@@ -70,7 +91,8 @@ public class CommandLineOptions {
}
return new CommandLineOptions(
- requestedProfileName == null ? null : requestedProfileName.trim());
+ requestedProfileName == null ? null : requestedProfileName.trim(),
+ composeMainWindow);
}
/**
@@ -96,6 +118,15 @@ public class CommandLineOptions {
*
* @return the requested profile name, or null when none was given
*/
+ /**
+ * Whether the Compose main window should be opened beside the JavaFX one.
+ *
+ * @return {@code true} only when --compose-main-window was passed
+ */
+ public boolean isComposeMainWindowRequested() {
+ return composeMainWindowRequested;
+ }
+
public String getRequestedProfileName() {
return requestedProfileName;
}
diff --git a/app-desktop/src/main/java/kst4contest/view/ComposeChatInputActions.java b/app-desktop/src/main/java/kst4contest/view/ComposeChatInputActions.java
new file mode 100644
index 00000000..683b9b3b
--- /dev/null
+++ b/app-desktop/src/main/java/kst4contest/view/ComposeChatInputActions.java
@@ -0,0 +1,99 @@
+package kst4contest.view;
+
+import kst4contest.model.ChatCategory;
+import kst4contest.model.ChatMember;
+import kst4contest.model.ChatMessage;
+import kst4contest.view.compose.ChatInputActions;
+
+/**
+ * What the Compose send line needs from the runtime.
+ *
+ * Every method forwards to the same code the JavaFX send button runs, so that while the two
+ * windows sit side by side a message sent from either takes exactly one path. The order the
+ * steps are called in lives in {@code ChatInputState}, where it is tested against the
+ * original; this class only answers questions.
+ */
+public final class ComposeChatInputActions implements ChatInputActions {
+
+ private final Kst4ContestApplication application;
+
+ public ComposeChatInputActions(final Kst4ContestApplication application) {
+ this.application = application;
+ }
+
+ @Override
+ public ChatMember panelSelection() {
+ return application.selectedCallSignInfoStageChatMember;
+ }
+
+ @Override
+ public ChatMember tableSelection() {
+ if (application.tbl_chatMember == null
+ || application.tbl_chatMember.getSelectionModel() == null) {
+ return null;
+ }
+ return application.tbl_chatMember.getSelectionModel().getSelectedItem();
+ }
+
+ @Override
+ public ChatMember scoreSelection() {
+ if (application.chatcontroller == null
+ || application.chatcontroller.getScoreService() == null) {
+ return null;
+ }
+ return application.chatcontroller.getScoreService().getSelectedChatMember();
+ }
+
+ @Override
+ public String resolveVariables(final String template, final ChatMember member) {
+ if (application.messageVariableResolver == null) {
+ return template;
+ }
+ return application.messageVariableResolver.resolveForSelectedStation(template, member);
+ }
+
+ @Override
+ public boolean isAddressedToOwnCallsign(final String text) {
+ return application.isMessageAddressedToOwnCallsignFromCompose(text);
+ }
+
+ @Override
+ public ChatCategory resolveCategory(final String text, final ChatMember member) {
+ return application.resolveOutgoingChatCategoryFromCompose(text, member);
+ }
+
+ @Override
+ public ChatCategory mainCategory() {
+ return application.chatcontroller.getChatCategoryMain();
+ }
+
+ @Override
+ public void recordOutboundCq(final String text) {
+ application.chatcontroller.getStationMetricsService()
+ .tryRecordOutboundCq(text, System.currentTimeMillis());
+ }
+
+ @Override
+ public void requestRecompute(final String reason) {
+ if (application.chatcontroller.getScoreService() != null) {
+ application.chatcontroller.getScoreService().requestRecompute(reason);
+ }
+ }
+
+ @Override
+ public void queue(final ChatMessage message) {
+ application.chatcontroller.getMessageTXBus().add(message);
+ }
+
+ @Override
+ public String ownQrgMain() {
+ String value = application.chatcontroller.getChatPreferences().getMYQRGFirstCat().get();
+ return value == null ? "" : value;
+ }
+
+ @Override
+ public String ownQrgSecond() {
+ String value = application.chatcontroller.getChatPreferences().getMYQRGSecondCat().get();
+ return value == null ? "" : value;
+ }
+}
diff --git a/app-desktop/src/main/java/kst4contest/view/ComposeMenuActions.java b/app-desktop/src/main/java/kst4contest/view/ComposeMenuActions.java
new file mode 100644
index 00000000..1d9ddf73
--- /dev/null
+++ b/app-desktop/src/main/java/kst4contest/view/ComposeMenuActions.java
@@ -0,0 +1,136 @@
+package kst4contest.view;
+
+import javafx.scene.control.MenuItem;
+import kst4contest.view.compose.MainMenuActions;
+
+import java.util.function.Supplier;
+
+/**
+ * The Compose menu bar's actions, delegated to the JavaFX menu items they mirror.
+ *
+ * Firing the very same {@link MenuItem} is deliberate. The two bars run side by side while
+ * the operator compares the windows, and a second implementation of seventeen handlers would
+ * be a second thing to compare — differences between the bars would be indistinguishable from
+ * differences between the windows.
+ *
+ * When the JavaFX window goes, those handlers move into methods of their own and this class
+ * calls those instead. Until then it is a bridge, not a design.
+ */
+public final class ComposeMenuActions implements MainMenuActions {
+
+ private final Kst4ContestApplication application;
+
+ public ComposeMenuActions(final Kst4ContestApplication application) {
+ this.application = application;
+ }
+
+ @Override
+ public void connect() {
+ fire(() -> application.menuItemFileConnect);
+ }
+
+ @Override
+ public void disconnect() {
+ fire(() -> application.menuItemFileDisconnect);
+ }
+
+ @Override
+ public void switchOperatorProfile() {
+ application.runOnUi(application::showOperatorProfileSwitchDialogFromCompose);
+ }
+
+ @Override
+ public void exitApplication() {
+ fire(() -> application.menuItemFileExit);
+ }
+
+ @Override
+ public void setQrgAsNameInChat() {
+ fire(() -> application.menuItemOptionsSetFrequencyAsName);
+ }
+
+ @Override
+ public void toggleAwayState() {
+ fire(() -> application.menuItemOptionsAwayBack);
+ }
+
+ @Override
+ public void toggleSettingsWindow() {
+ fire(() -> application.menuItemOptionsShow);
+ }
+
+ @Override
+ public void toggleMonitorWindow() {
+ fire(() -> application.menuItemWindowCluster);
+ }
+
+ @Override
+ public void toggleStationMap() {
+ fire(() -> application.menuItemWindowStationMap);
+ }
+
+ @Override
+ public void useDarkDesign() {
+ fire(() -> application.menuItemWindowDarkDesign);
+ }
+
+ @Override
+ public void useDefaultDesign() {
+ fire(() -> application.menuItemWindowDefaultDesign);
+ }
+
+ @Override
+ public void openDonationPage() {
+ fire(() -> application.menuItemInfoDonate);
+ }
+
+ @Override
+ public void openHomepage() {
+ fire(() -> application.menuItemInfoHomepage);
+ }
+
+ @Override
+ public void openNewsgroup() {
+ fire(() -> application.menuItemInfoNewsgroup);
+ }
+
+ @Override
+ public void openChangelog() {
+ /*
+ * The JavaFX item and its handler are both commented out, so there is nothing to
+ * fire. The Compose menu no longer offers this either; the method stays because the
+ * interface is shared and an empty body is honest about there being no such feature.
+ */
+ }
+
+ @Override
+ public void openOv3tDonationPage() {
+ fire(() -> application.menuItemInfoDonateOv3t);
+ }
+
+ @Override
+ public void contactAuthor() {
+ fire(() -> application.menuItemInfoContact);
+ }
+
+ @Override
+ public void showAbout() {
+ fire(() -> application.menuItemInfoAbout);
+ }
+
+ /**
+ * Fires a menu item on the JavaFX thread.
+ *
+ * The item is looked up when the action runs rather than when this class is built,
+ * because initMenuBar creates them after the runtime exists. A missing item is ignored:
+ * a menu entry that cannot act is better than a crash mid contest.
+ */
+ private void fire(final Supplier