diff --git a/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties b/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties index 82dbbae716e5d75508bf2c096d3d7204851530ae..0a25de603931f3f67290f340ead6ffcc0bc2a300 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties +++ b/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties @@ -119,6 +119,7 @@ keyboard.label.key=Taste (Tastatur): keyboard.button.new=�ndern padSettings.button.delete=L�schen +padSettings.button.path=Pfad zeigen padSettings.gen.label.title=Titel: padSettings.gen.label.volume=Lautst�rke: diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java index ae369ccae5a1a44dd98605255845eeca8d66c172..1e5c8fe376966380d0db3f6b9f86df74b6db5239 100644 --- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java +++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java @@ -58,7 +58,6 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand private IPadPositionListener padPositionListener; private PadDragListener padDragListener; - private transient PadSettingsViewController padSettingsViewController; public DesktopPadViewController(DesktopPadView padView) { this.padView = padView; @@ -150,12 +149,6 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand this.padDragListener = null; this.pad = null; - // Remove SettingsView Reference - if (padSettingsViewController != null) { - padSettingsViewController.getStage().close(); - padSettingsViewController = null; - } - // Hide Loading Animation if (getView() != null) getView().showBusyView(false); @@ -278,14 +271,13 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand } Stage owner = mvc.getStage(); - if (padSettingsViewController == null) { - padSettingsViewController = new PadSettingsViewController(pad, owner); - padSettingsViewController.getStage().setOnHiding(ev -> - { - if (padView != null && pad != null) - padView.setTriggerLabelActive(pad.getPadSettings().hasTriggerItems()); - }); - } + + PadSettingsViewController padSettingsViewController = new PadSettingsViewController(pad, owner); + padSettingsViewController.getStage().setOnHiding(ev -> + { + if (padView != null && pad != null) + padView.setTriggerLabelActive(pad.getPadSettings().hasTriggerItems()); + }); padSettingsViewController.getStage().show(); } } diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java index 4ea7467b20a51dab84b90d480edfa3ba607c5f53..a51ee521c1ea44ae3f0f894c4f59e41e47a32d76 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java @@ -41,7 +41,6 @@ import de.tobias.utils.util.Localization; import de.tobias.utils.util.OS; import de.tobias.utils.util.OS.OSType; import de.tobias.utils.util.Worker; -import de.tobias.utils.util.win.User32X; import javafx.application.Platform; import javafx.beans.property.DoubleProperty; import javafx.event.EventHandler; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java index e599ddc3be389da33591e968d1859fc083ef117e..468c689d0beae454669725b3c0e072e37c87c4a1 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java @@ -86,7 +86,7 @@ public class PadSettingsViewController extends ViewController implements IPadSet PadContent content = pad.getContent(); // nur EIN Path if (content instanceof SinglePathContent) { - Button button = new Button("Show Path"); + Button button = new Button(PlayPadMain.getUiResourceBundle().getString("padSettings.button.path")); // Referenz auf das Model Path path = ((SinglePathContent) content).getPath(); @@ -97,7 +97,7 @@ public class PadSettingsViewController extends ViewController implements IPadSet // Setzt globales Feld pathLookupButton = button; } else if (content instanceof MultiPathContent) { - MenuButton button = new MenuButton(PlayPadMain.getUiResourceBundle().getString("")); + MenuButton button = new MenuButton(PlayPadMain.getUiResourceBundle().getString("padSettings.button.path")); List<Path> paths = ((MultiPathContent) content).getPaths(); for (Path path : paths) {