From 651d28a31a8c49c62f67e8a4006938a24df86436 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Sat, 24 Sep 2016 18:18:35 +0200
Subject: [PATCH] Small Fixes
- Update GlobalSettings
- Add PageMenuHandler Listener for Menu
- DnD Bug, that removes wrong pads
---
.../de/tobias/playpad/assets/view/main/desktop/header.fxml | 2 +-
PlayWall/src/de/tobias/playpad/PlayPadMain.java | 2 +-
.../layout/desktop/DesktopMenuToolbarViewController.java | 5 +++++
PlayWallCore/src/de/tobias/playpad/project/Project.java | 6 ++++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml b/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
index 7cb4ef9a..d80d50eb 100644
--- a/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
+++ b/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
@@ -51,7 +51,7 @@
<KeyCodeCombination alt="UP" code="J" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
</accelerator>
</MenuItem>
- <MenuItem fx:id="pageMenu" mnemonicParsing="false" text="%main.menuitem.page">
+ <MenuItem fx:id="pageMenu" mnemonicParsing="false" onAction="#pageMenuHandler" text="%main.menuitem.page">
<accelerator>
<KeyCodeCombination alt="UP" code="K" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
</accelerator>
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 6f49ecf0..2e7f4e66 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -84,7 +84,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
public void init() throws Exception {
App app = ApplicationUtils.getApplication();
- Path globalSettingsPath = app.getPath(PathType.CONFIGURATION, "GlobalSettings.yml");
+ Path globalSettingsPath = app.getPath(PathType.CONFIGURATION, "GlobalSettings.xml");
GlobalSettings globalSettings = GlobalSettings.load(globalSettingsPath);
impl = new PlayPadImpl(globalSettings);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 641a812b..d36cee92 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -561,6 +561,11 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
void dragMenuHandler(ActionEvent event) {
connect.setEditMode(DesktopEditMode.DRAG);
}
+
+ @FXML
+ void pageMenuHandler(ActionEvent event) {
+ connect.setEditMode(DesktopEditMode.PAGE);
+ }
@FXML
void colorMenuHandler(ActionEvent event) {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index c4de04d5..449c23b1 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -110,10 +110,12 @@ public class Project {
public void setPad(PadIndex index, Pad pad) {
if (pad != null) {
-
if (pad.getPage() != index.getPage()) {
Page oldPage = getPage(pad.getPage());
- oldPage.removePade(index.getId());
+ // Nur Löschen, wenn auch noch das Pad an dieser Stelle ist, und nicht an andere Stelle
+ if (oldPage.getPad(pad.getIndex()).equals(pad)) {
+ oldPage.removePade(index.getId());
+ }
}
}
Page page = pages.get(index.getPage());
--
GitLab