From 94eaac4d280521822d1593bb25945b00a7fabed5 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Mon, 14 Dec 2020 20:20:25 +0100
Subject: [PATCH] Hide time shift input on trigger settings, if they dont
support this
---
.../playpad/trigger/TriggerDisplayable.java | 4 ++--
.../pad/trigger/CartTriggerViewController.java | 4 ++--
.../pad/trigger/TriggerPointViewController.java | 17 ++++++++++-------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
index 434a17a2..e6a6a6aa 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
@@ -10,7 +10,7 @@ import javafx.beans.property.StringProperty;
public class TriggerDisplayable implements Displayable {
- private Trigger trigger;
+ private final Trigger trigger;
public TriggerDisplayable(Trigger trigger) {
this.trigger = trigger;
@@ -21,7 +21,7 @@ public class TriggerDisplayable implements Displayable {
return trigger;
}
- private StringProperty displayable = new SimpleStringProperty();
+ private final StringProperty displayable = new SimpleStringProperty();
@Override
public StringProperty displayProperty() {
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
index a5d2f0ea..854bcf6a 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
@@ -25,9 +25,9 @@ public class CartTriggerViewController extends NVC {
@FXML
private CheckBox allCartsCheckbox;
- private ProjectPreviewView projectPreviewView;
+ private final ProjectPreviewView projectPreviewView;
- private CartTriggerItem item;
+ private final CartTriggerItem item;
public CartTriggerViewController(CartTriggerItem item) {
load("view/option/pad/trigger", "CartTrigger", Localization.getBundle());
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
index 77d5166b..4e79c669 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
@@ -26,14 +26,15 @@ public class TriggerPointViewController extends NVC {
@FXML
private HBox buttonBox;
- private TriggerDisplayable triggerWrapper;
+ private final TriggerDisplayable triggerWrapper;
public TriggerPointViewController(TriggerDisplayable triggerWrapper) {
load("view/option/pad/trigger", "TriggerPoint", Localization.getBundle());
this.triggerWrapper = triggerWrapper;
- for (TriggerItem item : triggerWrapper.getTrigger().getItems())
+ for (TriggerItem item : triggerWrapper.getTrigger().getItems()) {
showTriggerItem(item);
+ }
}
@Override
@@ -42,14 +43,14 @@ public class TriggerPointViewController extends NVC {
types.stream().sorted().forEach(item ->
{
try {
- TriggerItemFactory conntect = PlayPadPlugin.getRegistries().getTriggerItems().getFactory(item);
- Button button = new Button(conntect.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
+ TriggerItemFactory factory = PlayPadPlugin.getRegistries().getTriggerItems().getFactory(item);
+ Button button = new Button(factory.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
button.setContentDisplay(ContentDisplay.TOP);
button.setPrefWidth(150);
button.setOnAction(e ->
{
- TriggerItem triggerItem = conntect.newInstance(triggerWrapper.getTrigger());
+ TriggerItem triggerItem = factory.newInstance(triggerWrapper.getTrigger());
triggerWrapper.addItem(triggerItem);
showTriggerItem(triggerItem);
@@ -70,8 +71,10 @@ public class TriggerPointViewController extends NVC {
if (controller != null) {
itemBox.getChildren().add(controller.getParent());
- NVC timeViewController = new TriggerTimeViewController(item);
- itemBox.getChildren().add(timeViewController.getParent());
+ if (triggerWrapper.getTrigger().getTriggerPoint().isTimeAppendable()) {
+ final NVC timeViewController = new TriggerTimeViewController(item);
+ itemBox.getChildren().add(timeViewController.getParent());
+ }
Button deleteButton = new Button("", new FontIcon(FontAwesomeType.TRASH));
HBox hbox = new HBox(itemBox, deleteButton);
--
GitLab