boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

#921 Make terms of acceptance full screen for readability and copy to clipboard icon

Browse source
This commit is contained in:
nsec1 2024-05-28 09:47:19 -03:00 committed by woodser
parent 7c3e87ed38
commit 879ed9b10a
2 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java
View file

@ -35,6 +35,7 @@ import haveno.desktop.components.BusyAnimation;
import haveno.desktop.main.MainView;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import haveno.desktop.util.Layout;
import haveno.desktop.util.Transitions;
import javafx.animation.Interpolator;
import javafx.animation.KeyFrame;
@ -48,12 +49,14 @@ import javafx.geometry.HPos;
import javafx.geometry.Insets;
import javafx.geometry.NodeOrientation;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.PerspectiveCamera;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.ScrollPane.ScrollBarPolicy;
import javafx.scene.input.KeyCode;
@ -85,6 +88,8 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static javafx.scene.input.MouseEvent.MOUSE_CLICKED;
@Slf4j
public abstract class Overlay<T extends Overlay<T>> {
@ -158,7 +163,7 @@ public abstract class Overlay<T extends Overlay<T>> {
protected boolean useAnimation = true;
protected boolean showScrollPane = false;
protected Label headlineIcon, headLineLabel, messageLabel;
protected Label headlineIcon, copyIcon, headLineLabel, messageLabel;
protected String headLine, message, closeButtonText, actionButtonText,
secondaryActionButtonText, dontShowAgainId, dontShowAgainText,
truncatedMessage;
@ -748,6 +753,23 @@ public abstract class Overlay<T extends Overlay<T>> {
if (headLineLabel != null) {
if (copyIcon != null) {
copyIcon.getStyleClass().add("popup-icon-information");
copyIcon.setManaged(true);
copyIcon.setVisible(true);
FormBuilder.getIconForLabel(AwesomeIcon.COPY, copyIcon, "1.1em");
copyIcon.addEventHandler(MOUSE_CLICKED, mouseEvent -> {
if (message != null) {
String forClipboard = headLineLabel.getText() + System.lineSeparator() + message
+ System.lineSeparator() + (messageHyperlinks == null ? "" : messageHyperlinks.toString());
Utilities.copyToClipboard(forClipboard);
Tooltip tp = new Tooltip(Res.get("shared.copiedToClipboard"));
Node node = (Node) mouseEvent.getSource();
UserThread.runAfter(() -> tp.hide(), 1);
tp.show(node, mouseEvent.getScreenX() + Layout.PADDING, mouseEvent.getScreenY() + Layout.PADDING);
}
});
}
switch (type) {
case Information:
@ -802,7 +824,19 @@ public abstract class Overlay<T extends Overlay<T>> {
if (headlineStyle != null)
headLineLabel.setStyle(headlineStyle);
if (message != null) {
copyIcon = new Label();
copyIcon.setManaged(false);
copyIcon.setVisible(false);
copyIcon.setPadding(new Insets(3));
copyIcon.setTooltip(new Tooltip(Res.get("shared.copyToClipboard")));
final Pane spacer = new Pane();
HBox.setHgrow(spacer, Priority.ALWAYS);
spacer.setMinSize(Layout.PADDING, 1);
hBox.getChildren().addAll(headlineIcon, headLineLabel, spacer, copyIcon);
} else {
hBox.getChildren().addAll(headlineIcon, headLineLabel);
}
GridPane.setHalignment(hBox, HPos.LEFT);
GridPane.setRowIndex(hBox, rowIndex);

3
desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java
View file

@ -41,7 +41,7 @@ public class TacWindow extends Overlay<TacWindow> {
this.width = primaryScreenBoundsWidth * 0.8;
log.warn("Very small screen: primaryScreenBounds=" + primaryScreenBounds.toString());
} else {
width = 1100;
width = 1250;
}
}
@ -78,7 +78,6 @@ public class TacWindow extends Overlay<TacWindow> {
" - In case of arbitration, you must cooperate with the arbitrator and respond to each message within 48 hours.\n" +
" - The arbitrator may penalize offer makers and traders for breaching Haveno rules and the principle of acting in good faith within the network, up to the value of the security deposit.\n";
message(text);
showScrollPane();
actionButtonText(Res.get("tacWindow.agree"));
closeButtonText(Res.get("tacWindow.disagree"));
onClose(HavenoApp.getShutDownHandler());