Remove walletprefix, fix key event listener, v 0.3.2.23-snapshot

This commit is contained in:
Manfred Karrer 2015-12-29 00:36:19 +01:00
parent 4ef1a5e567
commit c2dbd55e77
20 changed files with 27 additions and 27 deletions

View file

@ -48,6 +48,7 @@ import javafx.scene.image.Image;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.stage.Modality;
@ -156,7 +157,7 @@ public class BitsquareApp extends Application {
else
stop();
});
scene.setOnKeyReleased(keyEvent -> {
scene.addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {
if (BitsquareApp.IS_RELEASE_VERSION)
stop(); //systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)

View file

@ -32,6 +32,7 @@ import javafx.scene.control.cell.TextFieldTableCell;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.util.Callback;
@ -128,8 +129,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
}
// we add hidden emergency shortcut to open support ticket
root.getScene().setOnKeyReleased(keyEvent -> {
if (new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
root.getScene().addEventHandler(KeyEvent.KEY_RELEASED, event -> {
if (new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN).match(event))
new OpenEmergencyTicketPopup().onOpenTicket(() -> model.dataModel.onOpenSupportTicket()).show();
});
}