From 279145a5ca1bc90e79b5dd99e06665791b98a96f Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 19 Nov 2014 16:10:26 +0100 Subject: [PATCH] Add support if desktop.browse(uri) is not supported --- .../java/io/bitsquare/gui/components/AddressTextField.java | 7 +------ .../java/io/bitsquare/gui/components/TxIdTextField.java | 6 +++--- .../gui/main/account/content/irc/IrcAccountViewCB.java | 6 ++++-- src/main/java/io/bitsquare/gui/main/help/Help.java | 5 ++++- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/src/main/java/io/bitsquare/gui/components/AddressTextField.java index 93a73287d7..9ec8402835 100644 --- a/src/main/java/io/bitsquare/gui/components/AddressTextField.java +++ b/src/main/java/io/bitsquare/gui/components/AddressTextField.java @@ -23,8 +23,6 @@ import io.bitsquare.util.Utilities; import org.bitcoinj.core.Coin; import org.bitcoinj.uri.BitcoinURI; -import java.awt.*; - import java.io.ByteArrayInputStream; import java.io.IOException; @@ -34,10 +32,7 @@ import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -import javafx.scene.control.Label; -import javafx.scene.control.TextField; import javafx.scene.control.*; -import javafx.scene.image.Image; import javafx.scene.image.*; import javafx.scene.layout.*; import javafx.stage.Window; @@ -75,7 +70,7 @@ public class AddressTextField extends AnchorPane { Tooltip.install(textField, new Tooltip("Open your default Bitcoin wallet with that address.")); textField.setOnMouseClicked(mouseEvent -> { try { - Desktop.getDesktop().browse(URI.create(getBitcoinURI())); + Utilities.openURI(URI.create(getBitcoinURI())); } catch (IOException e) { log.warn(e.getMessage()); Popups.openWarningPopup("Warning", "Opening a system Bitcoin wallet application has failed. " + diff --git a/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/src/main/java/io/bitsquare/gui/components/TxIdTextField.java index 8bad91e2ed..1994685d18 100644 --- a/src/main/java/io/bitsquare/gui/components/TxIdTextField.java +++ b/src/main/java/io/bitsquare/gui/components/TxIdTextField.java @@ -95,11 +95,11 @@ public class TxIdTextField extends AnchorPane { textField.setOnMouseClicked(mouseEvent -> { try { // TODO get the url form the app preferences - Utilities.openURL("https://www.biteasy.com/testnet/transactions/" + txID); + Utilities.openWebPage("https://www.biteasy.com/testnet/transactions/" + txID); //Utilities.openURL("https://blockchain.info/tx/" + txID); } catch (Exception e) { - log.warn(e.getMessage()); - Popups.openWarningPopup("Warning", "Opening blockchain.info failed. Please check your internet " + + log.error(e.getMessage()); + Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " + "connection."); } }); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java index 08cf21f10d..e3b07463eb 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java @@ -205,9 +205,11 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont @FXML void onOpenIRC() { try { - Utilities.openURL("https://webchat.freenode.net/?channels=bitsquare-trading"); + Utilities.openWebPage("https://webchat.freenode.net/?channels=bitsquare-trading"); } catch (Exception e) { - log.error("Cannot open browser. " + e.getMessage()); + log.error(e.getMessage()); + Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " + + "connection."); } } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/help/Help.java b/src/main/java/io/bitsquare/gui/main/help/Help.java index cd7358ab42..e592b5baeb 100644 --- a/src/main/java/io/bitsquare/gui/main/help/Help.java +++ b/src/main/java/io/bitsquare/gui/main/help/Help.java @@ -17,6 +17,7 @@ package io.bitsquare.gui.main.help; +import io.bitsquare.gui.components.Popups; import io.bitsquare.util.Utilities; import org.slf4j.Logger; @@ -33,10 +34,12 @@ public class Help { public static void openWindow(HelpId id) { try { - Utilities.openURL("https://docs.bitsquare.io/0.1.0-SNAPSHOT/userguide/index.html"); + Utilities.openWebPage("https://docs.bitsquare.io/0.1.0-SNAPSHOT/userguide/index.html"); // URL url = new URL("https://docs.bitsquare.io/0.1.0-SNAPSHOT/userguide/index.html#" + id); } catch (Exception e) { log.error(e.getMessage()); + Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " + + "connection."); } }