Merge pull request #1 from bisq-network/master

Bringing my fork up to date
bisq-network · Feb 8, 2018 · c8283af · c8283af
2 parents 82bc3bd + ed0148b
commit c8283af
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: java
 jdk: oraclejdk8
 
-script: mvn clean install -DskipTests
-
 notifications:
   slack:
     rooms:

diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java b/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java
@@ -715,6 +715,12 @@ public ListCell<DisputeCommunicationMessage> call(ListView<DisputeCommunicationM
                             statusIcon.getStyleClass().add("small-text");
                             copyIcon.setTooltip(new Tooltip(Res.get("shared.copyToClipboard")));
                             messageAnchorPane.getChildren().addAll(bg, arrow, headerLabel, messageLabel, copyIcon, attachmentsBox, statusIcon);
+                            messageLabel.setOnMouseClicked(event -> {
+                                if (2 > event.getClickCount()) {
+                                    return;
+                                }
+                                GUIUtil.showSelectableTextModal(headerLabel.getText(), messageLabel.getText());
+                            });
                         }
 
                         @Override
@@ -909,7 +915,6 @@ private void showArrivedIcon() {
             root.getChildren().add(2, messagesAnchorPane);
 
             scrollToBottom();
-            GUIUtil.requestFocus(inputTextArea);
         }
 
         addListenersOnSelectDispute();

diff --git a/gui/src/main/java/io/bisq/gui/util/GUIUtil.java b/gui/src/main/java/io/bisq/gui/util/GUIUtil.java
@@ -46,16 +46,15 @@
 import io.bisq.gui.main.overlays.popups.Popup;
 import io.bisq.network.p2p.P2PService;
 import javafx.beans.property.DoubleProperty;
-import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.control.ScrollBar;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
-import javafx.stage.DirectoryChooser;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
+import javafx.stage.*;
 import javafx.util.StringConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.bitcoinj.core.Address;
@@ -64,7 +63,6 @@
 import org.bitcoinj.uri.BitcoinURI;
 import org.bitcoinj.wallet.DeterministicSeed;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -73,9 +71,9 @@
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Slf4j
 public class GUIUtil {
@@ -446,4 +444,22 @@ public static void restoreSeedWords(DeterministicSeed seed, WalletsManager walle
                             .show();
                 }));
     }
+
+    public static void showSelectableTextModal(String title, String text) {
+        TextArea textArea = new TextArea();
+        textArea.setText(text);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+        textArea.setPrefSize(800, 600);
+
+        Scene scene = new Scene(textArea);
+        Stage stage = new Stage();
+        if (null != title) {
+            stage.setTitle(title);
+        }
+        stage.setScene(scene);
+        stage.initModality(Modality.NONE);
+        stage.initStyle(StageStyle.UTILITY);
+        stage.show();
+    }
 }