From 6272b360c09eac5d6bd01ed1f4ab620ed078db78 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 23 Oct 2014 21:11:08 +0200 Subject: [PATCH] Add IRC link and info popup --- .../java/io/bitsquare/gui/CachedViewCB.java | 8 ++--- .../gui/main/account/AccountViewCB.java | 3 ++ .../account/content/irc/IrcAccountView.fxml | 21 +++++++----- .../account/content/irc/IrcAccountViewCB.java | 33 ++++++++++++++++++- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java index 5b086e5147..960fa696da 100644 --- a/src/main/java/io/bitsquare/gui/CachedViewCB.java +++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java @@ -74,9 +74,9 @@ public class CachedViewCB extends ViewCB { */ public void activate() { log.trace("Lifecycle: activate " + this.getClass().getSimpleName()); - if (childController instanceof CachedViewCB) + /* if (childController instanceof CachedViewCB) ((CachedViewCB) childController).activate(); - +*/ if (presentationModel != null) presentationModel.activate(); } @@ -86,8 +86,8 @@ public class CachedViewCB extends ViewCB { */ public void deactivate() { log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName()); - if (childController instanceof CachedViewCB) - ((CachedViewCB) childController).deactivate(); + /* if (childController instanceof CachedViewCB) + ((CachedViewCB) childController).deactivate();*/ if (presentationModel != null) presentationModel.deactivate(); diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java index 935801478f..27497c60f6 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java @@ -156,6 +156,9 @@ public class AccountViewCB extends CachedViewCB { break; } + // for IRC demo we deactivate the arbitratorSettingsTab + arbitratorSettingsTab.setDisable(true); + tab.setContent(view); ((TabPane) root).getSelectionModel().select(tab); Initializable childController = loader.getController(); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml index b0b5a06e9b..32fa4b16ef 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml @@ -47,19 +47,23 @@ -