Remove enter handler

This commit is contained in:
Manfred Karrer 2016-04-11 21:52:10 +02:00
parent 4cce01a930
commit a828dc745b
4 changed files with 42 additions and 1 deletions

View file

@ -38,7 +38,9 @@ import javafx.beans.binding.ObjectBinding;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.geometry.VPos; import javafx.geometry.VPos;
import javafx.scene.Scene;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.input.KeyCode;
import javafx.scene.layout.FlowPane; import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
@ -126,6 +128,18 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
feeToggleGroup.selectedToggleProperty().removeListener(feeToggleSelectionListener); feeToggleGroup.selectedToggleProperty().removeListener(feeToggleSelectionListener);
} }
@Override
protected void setupKeyHandler(Scene scene) {
if (!hideCloseButton) {
scene.setOnKeyPressed(e -> {
if (e.getCode() == KeyCode.ESCAPE) {
e.consume();
doClose();
}
});
}
}
@Override @Override
protected void createGridPane() { protected void createGridPane() {
super.createGridPane(); super.createGridPane();

View file

@ -102,7 +102,6 @@ public class EmptyWalletWindow extends Overlay<EmptyWalletWindow> {
}); });
} }
} }
private void addContent() { private void addContent() {
addMultilineLabel(gridPane, ++rowIndex, addMultilineLabel(gridPane, ++rowIndex,

View file

@ -22,8 +22,10 @@ import io.bitsquare.gui.main.overlays.Overlay;
import io.bitsquare.gui.main.overlays.popups.Popup; import io.bitsquare.gui.main.overlays.popups.Popup;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.scene.Scene;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.input.KeyCode;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
@ -86,6 +88,18 @@ public class EnterPrivKeyWindow extends Overlay<EnterPrivKeyWindow> {
protected void cleanup() { protected void cleanup() {
} }
@Override
protected void setupKeyHandler(Scene scene) {
if (!hideCloseButton) {
scene.setOnKeyPressed(e -> {
if (e.getCode() == KeyCode.ESCAPE) {
e.consume();
doClose();
}
});
}
}
private void addInputFields() { private void addInputFields() {
Label label = new Label("Enter private key:"); Label label = new Label("Enter private key:");
label.setWrapText(true); label.setWrapText(true);

View file

@ -24,10 +24,12 @@ import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.main.overlays.Overlay; import io.bitsquare.gui.main.overlays.Overlay;
import io.bitsquare.gui.main.overlays.popups.Popup; import io.bitsquare.gui.main.overlays.popups.Popup;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.scene.Scene;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import javafx.scene.input.KeyCode;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -89,6 +91,18 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
// Protected // Protected
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected void setupKeyHandler(Scene scene) {
if (!hideCloseButton) {
scene.setOnKeyPressed(e -> {
if (e.getCode() == KeyCode.ESCAPE) {
e.consume();
doClose();
}
});
}
}
private void addContent() { private void addContent() {
InputTextField keyInputTextField = addLabelInputTextField(gridPane, ++rowIndex, "Alert private key:", 10).second; InputTextField keyInputTextField = addLabelInputTextField(gridPane, ++rowIndex, "Alert private key:", 10).second;