Tray icon / Info Window fixes

Author: Geosearchef

ice-adapter/src/main/java/com/faforever/iceadapter/IceAdapter.java

@@ -143,6 +143,7 @@ public static void close() {
         onFAShutdown();//will close gameSession aswell
         GPGNetServer.close();
         RPCService.close();
+        TrayIcon.close();
 
         System.exit(0);
     }

ice-adapter/src/main/java/com/faforever/iceadapter/debug/Debug.java

@@ -19,6 +19,7 @@ public class Debug {
 
 	public static void init() {
 		// Debugger window is started and set to debugFuture when either window is requested as the info window can be used to open the debug window
+		// This is not used anymore as the debug window is started and hidden in case it is requested via the tray icon
 		if(! ENABLE_DEBUG_WINDOW && ! ENABLE_INFO_WINDOW) {
 			debug.complete(new NoDebugger());
 			return;

ice-adapter/src/main/java/com/faforever/iceadapter/debug/DebugWindow.java

@@ -76,6 +76,11 @@ public void start(Stage stage) {
 
 //		new Thread(() -> Debug.debug.complete(this)).start();
 		log.info("Created debug window.");
+
+		//TODO: this is pretty hacky, replaces NoDebugger in case the context got just created from the tray icon
+		if (Debug.debug.isDone()) {
+			Debug.debug = new CompletableFuture<>();
+		}
 		Debug.debug.complete(this);
 
 		if(Debug.ENABLE_INFO_WINDOW) {

ice-adapter/src/main/java/com/faforever/iceadapter/debug/InfoWindow.java

@@ -59,10 +59,14 @@ public void init() {
 	}
 
 	public void minimize() {
+		Platform.setImplicitExit(false);
 		Platform.runLater(this.stage::hide);
 	}
 
 	public void show() {
-		Platform.runLater(this.stage::show);
+		Platform.runLater(() -> {
+			this.stage.show();
+			Platform.setImplicitExit(true);
+		});
 	}
 }

ice-adapter/src/main/java/com/faforever/iceadapter/util/TrayIcon.java

@@ -1,5 +1,7 @@
 package com.faforever.iceadapter.util;
 
+import com.faforever.iceadapter.debug.Debug;
+import com.faforever.iceadapter.debug.DebugWindow;
 import com.faforever.iceadapter.debug.InfoWindow;
 import lombok.extern.slf4j.Slf4j;
 
@@ -42,9 +44,14 @@ public void mouseClicked(MouseEvent mouseEvent) {
 
 			@Override
 			public void mousePressed(MouseEvent mouseEvent) {
-				if (InfoWindow.INSTANCE != null) {
-					InfoWindow.INSTANCE.show();
-				}
+				new Thread(() -> {
+					if (InfoWindow.INSTANCE == null) {
+						Debug.ENABLE_INFO_WINDOW = true;
+						DebugWindow.launchApplication();
+					} else {
+						InfoWindow.INSTANCE.show();
+					}
+				}).start();
 			}
 
 			@Override
@@ -60,14 +67,14 @@ public void mouseExited(MouseEvent mouseEvent) {
 			}
 		});
 
-		showMessage("ICE Adapter started");
-
 		try {
 			SystemTray.getSystemTray().add(trayIcon);
 		} catch (AWTException e) {
 			log.error("Tray icon could not be added", e);
 		}
 
+		showMessage("ICE Adapter started");
+
 		log.info("Created tray icon");
 	}
 

ice-adapter/src/main/resources/infoWindow.fxml

@@ -27,7 +27,7 @@
                 </padding>
             </HBox>
 
-            <Label text="FAForever is currently testing a new connectivity solution to reduce&#10;disconnects while in game."
+            <Label text="This adapter establishes and monitors your connection to other players in game.&#10;Closing it will terminate all connections."
                    wrapText="true" textAlignment="CENTER"></Label>
 
 
@@ -37,7 +37,8 @@
                 </padding>
             </HBox>
 
-            <Label text="Please keep this window open while the game is in progress." styleClass="bold-text" textAlignment="CENTER"/>
+            <Label text="Please keep it running while the game is in progress." styleClass="bold-text"
+                   textAlignment="CENTER"/>
 
             <HBox>
                 <padding>