From c294b92d778c6016abd79e799076a91a1b7bdcc8 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Wed, 16 Feb 2022 01:46:44 +0100 Subject: [PATCH] alert fixes --- .../protocol/connection/proxy/ProxyProviderFactory.java | 6 ++++-- .../connection/proxy/flash/FlashProxyProvider.java | 4 +++- .../connection/proxy/nitro/http/NitroHttpProxy.java | 9 ++++++--- .../network/authentication/Authenticator.java | 6 +++++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java index e437c83..783f4d0 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java @@ -13,6 +13,7 @@ import gearth.ui.titlebar.TitleBarController; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; +import javafx.scene.control.Label; import javafx.scene.image.Image; import javafx.scene.layout.Region; import javafx.stage.Stage; @@ -106,9 +107,10 @@ public class ProxyProviderFactory { } Platform.runLater(() -> { - Alert alert = new Alert(Alert.AlertType.ERROR, "G-Earth is already connected to this hotel. " + + Alert alert = new Alert(Alert.AlertType.ERROR, "", ButtonType.OK); + alert.getDialogPane().getChildren().add(new Label("G-Earth is already connected to this hotel.\n" + "Due to current limitations you can only connect one session per hotel to G-Earth in Raw IP mode on Windows.\n\n" + - "You can bypass this by using a SOCKS proxy [Extra -> Advanced -> SOCKS]", ButtonType.OK); + "You can bypass this by using a SOCKS proxy [Extra -> Advanced -> SOCKS]")); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.setResizable(false); try { diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java index c27ff8f..dbbc7af 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java @@ -15,6 +15,7 @@ import gearth.ui.titlebar.TitleBarController; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; +import javafx.scene.control.Label; import javafx.scene.image.Image; import javafx.scene.layout.Region; import javafx.stage.Stage; @@ -124,7 +125,8 @@ public abstract class FlashProxyProvider implements ProxyProvider { protected void showInvalidConnectionError() { Platform.runLater(() -> { - Alert alert = new Alert(Alert.AlertType.ERROR, "You entered invalid connection information, G-Earth could not connect", ButtonType.OK); + Alert alert = new Alert(Alert.AlertType.ERROR, "", ButtonType.OK); + alert.getDialogPane().getChildren().add(new Label("You entered invalid connection information, G-Earth could not connect")); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.setResizable(false); try { diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java index e9ac358..f056564 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java @@ -9,6 +9,7 @@ import gearth.ui.titlebar.TitleBarController; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; +import javafx.scene.control.Label; import javafx.scene.image.Image; import javafx.stage.Stage; import org.littleshoot.proxy.HttpProxyServer; @@ -53,12 +54,14 @@ public class NitroHttpProxy { Platform.runLater(() -> { Alert alert = ConfirmationDialog.createAlertWithOptOut(Alert.AlertType.WARNING, ADMIN_WARNING_KEY, "Root certificate installation", null, - "G-Earth detected that you do not have the root certificate authority installed. " + - "This is required for Nitro to work, do you want to continue? " + - "G-Earth will ask you for Administrator permission if you do so.", "Remember my choice", + "", "Remember my choice", ButtonType.YES, ButtonType.NO ); + alert.getDialogPane().setContent(new Label("G-Earth detected that you do not have the root certificate authority installed.\n" + + "This is required for Nitro to work, do you want to continue?\n" + + "G-Earth will ask you for Administrator permission if you do so.")); + try { shouldInstall.set(TitleBarController.create(alert).showAlertAndWait() .filter(t -> t == ButtonType.YES).isPresent()); diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java index 7047364..5f6b694 100644 --- a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java @@ -6,6 +6,7 @@ import gearth.ui.titlebar.TitleBarController; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; +import javafx.scene.control.Label; import java.io.IOException; import java.util.*; @@ -68,10 +69,13 @@ public class Authenticator { Platform.runLater(() -> { Alert alert = ConfirmationDialog.createAlertWithOptOut(Alert.AlertType.WARNING, connectExtensionKey ,"Confirmation Dialog", null, - "Extension \""+extension.getTitle()+"\" tries to connect but isn't known to G-Earth, accept this connection?", "Remember my choice", + "", "Remember my choice", ButtonType.YES, ButtonType.NO ); + alert.getDialogPane().setContent(new Label("Extension \""+extension.getTitle()+"\" tries to connect but isn't known to G-Earth,\n" + + "accept this connection?")); + try { if (!(TitleBarController.create(alert).showAlertAndWait() .filter(t -> t == ButtonType.YES).isPresent())) {