diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java index 78b9f8fa39d3ae49194aca0c8d6a38847981e9d3..f43badee37c3c34273b2c365d6c0eef5080ba003 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java @@ -41,6 +41,7 @@ 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; @@ -177,6 +178,12 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon public void init() { padGridPane.getStyleClass().add("pad-grid"); + // TODO TOUCH + if (OS.isWindows() && User32X.isTouchAvailable()) { + padGridPane.setOnSwipeLeft(e -> showPage(currentPageShowing - 1)); + padGridPane.setOnSwipeRight(e -> showPage(currentPageShowing + 1)); + } + notificationPane = new NotificationPane(padGridPane); notificationPane.getStyleClass().add(NotificationPane.STYLE_CLASS_DARK); diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java b/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java index 44724c67c6a3815083e9c4eac9bb2b697f63acf9..d69e9cb119cafa29ba63c53f0848dc13f0fcd939 100644 --- a/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java +++ b/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java @@ -125,8 +125,8 @@ public class ProjectReference implements Displayable { } private static void duplicateFiles(ProjectReference currentProject, ProjectReference newProjectReference) throws IOException { - Path oldPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, currentProject.getName()); - Path newPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, newProjectReference.getName()); + Path oldPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, currentProject.getFileName()); + Path newPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, newProjectReference.getFileName()); Files.copy(oldPath, newPath, StandardCopyOption.COPY_ATTRIBUTES); } diff --git a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java index 73d9ba15ff65457e984f61d95bb43b9981af6b97..48c9d864b835df013f86031d27131dfbf4a77cb4 100644 --- a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java +++ b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java @@ -18,7 +18,7 @@ public class Fade { fadeIn = Duration.ZERO; fadeOut = Duration.ZERO; - fadeInStart = true; + fadeInStart = false; fadeInPause = true; fadeOutPause = true; fadeOutStop = true;