diff --git a/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java b/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
index 76d1ecb40bad3460d5c297150fec084d65b621b3..07f9abf3207ae4cdd9db2a421c782df52339d3c8 100644
--- a/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
+++ b/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
@@ -329,7 +329,7 @@ public class ClassicGlobalDesign extends Design implements GlobalDesign {
if (padSettings.isCustomLayout()) {
CartDesign layoutOpt = padSettings.getLayout();
- css += "\n" + layoutOpt.convertToCss(String.valueOf(pad.getIndex()), true);
+ css += "\n" + layoutOpt.convertToCss(pad.getPadIndex().toString(), true);
}
}
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
index 08f9fa176eb0c24f1a3e860ef30e69dba2746491..bdb959e99cca8d4025b3311441eef00cfcce6a31 100644
--- a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
+++ b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
@@ -200,7 +200,7 @@ public class ModernGlobalDesign extends Design implements GlobalDesign, DesignCo
if (padSettings.isCustomLayout()) {
CartDesign layoutOpt = padSettings.getLayout(Profile.currentProfile().getProfileSettings().getLayoutType());
- css += "\n" + layoutOpt.convertToCss(String.valueOf(pad.getIndex()), true);
+ css += "\n" + layoutOpt.convertToCss(pad.getPadIndex().toString(), true);
}
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
index 72d74d982d3b7465e7abe24e6b4c0a58774e56ea..9a4553e856323f4e244ba85b1e3bb05ff7a1bdd7 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
@@ -10,6 +10,7 @@ import de.tobias.playpad.pad.conntent.play.Pauseable;
import de.tobias.playpad.pad.view.IPadContentView;
import de.tobias.playpad.pad.view.IPadView;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.view.EmptyPadView;
import de.tobias.utils.ui.icon.FontAwesomeType;
@@ -301,7 +302,7 @@ public class DesktopPadView implements IPadView {
}
@Override
- public void applyStyleClasses(int index) {
+ public void applyStyleClasses(PadIndex index) {
superRoot.getStyleClass().addAll("pad", "pad" + index);
indexLabel.getStyleClass().addAll("pad-index", "pad" + index + "-index", "pad-info", "pad" + index + "-info");
@@ -333,7 +334,7 @@ public class DesktopPadView implements IPadView {
@Override
public void removeStyleClasses() {
Pad pad = getViewController().getPad();
- int index = pad.getIndex();
+ PadIndex index = pad.getPadIndex();
superRoot.getStyleClass().removeAll("pad", "pad" + index);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
index 0384a296e54b07d84224036dd1865e53d0717f57..1b14efa61954078b2d9d588f0cd835f422ab02ff 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
@@ -114,7 +114,7 @@ public class DesktopPadViewController implements IPadViewController, EventHandle
e.printStackTrace();
}
- padView.applyStyleClasses(pad.getIndex());
+ padView.applyStyleClasses(pad.getPadIndex());
padView.setContentView(pad);
}
@@ -269,7 +269,7 @@ public class DesktopPadViewController implements IPadViewController, EventHandle
}
Stage owner = mvc.getStage();
-
+
PadSettingsViewController padSettingsViewController = new PadSettingsViewController(pad, owner);
padSettingsViewController.getStage().setOnHiding(ev ->
{
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
index 4e23c6ac8ed28a00b7a12187e0f3fc459274e525..ac2e99faf82ec682bed7e7fb4f0636a07f259deb 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
@@ -8,6 +8,7 @@ import de.tobias.playpad.pad.conntent.PadContentConnect;
import de.tobias.playpad.pad.view.IPadContentView;
import de.tobias.playpad.pad.view.IPadView;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.view.EmptyPadView;
import de.tobias.utils.ui.icon.FontAwesomeType;
@@ -231,7 +232,7 @@ public class TouchPadView implements IPadView {
}
@Override
- public void applyStyleClasses(int index) {
+ public void applyStyleClasses(PadIndex index) {
superRoot.getStyleClass().addAll("pad", "pad" + index);
indexLabel.getStyleClass().addAll("pad-index", "pad" + index + "-index", "pad-info", "pad" + index + "-info");
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
index 11ef9044b35d086c2f6dbcce2d21a24b8714d7e4..38c35cca8b74fb9fa24b34cfca52f810b6dadf5a 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
@@ -87,9 +87,7 @@ public class TouchPadViewController implements IPadViewController, EventHandler<
pad.statusProperty().addListener(padStatusListener);
// First Listener call with new data
- padContentListener.changed(null, null, pad.getContent()); // Add
- // Duration
- // listener
+ padContentListener.changed(null, null, pad.getContent()); // Add Duration listener
padStatusListener.changed(null, null, pad.getStatus());
padDragListener = new PadDragListener(pad, padView);
@@ -97,7 +95,7 @@ public class TouchPadViewController implements IPadViewController, EventHandler<
e.printStackTrace();
}
- padView.applyStyleClasses(pad.getIndex());
+ padView.applyStyleClasses(pad.getPadIndex());
padView.setContentView(pad);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
index 67c3ce99cb1b6a3956df92cea0d6a50783f68d39..8cda8936e8c843a492f971e3d6509858bd75818b 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
@@ -2,6 +2,7 @@ package de.tobias.playpad.pad.view;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import javafx.css.PseudoClass;
import javafx.scene.layout.Pane;
@@ -120,8 +121,11 @@ public interface IPadView {
/**
* Fügt die StyleClasses der PadView hinzu. Die Methode wird vom Controller aufgerufen.
+ *
+ * @param index
+ * Index von der Kachel
*/
- public void applyStyleClasses(int index);
+ public void applyStyleClasses(PadIndex index);
/**
* Entfernt die StyleClasses vom PadView. Die Methode wird vom Controller aufgerufen.
diff --git a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java b/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
index 11067feea3e89e1eba4e4aafa1fa5193ad800a3a..d8e3e6fd495e721e72668cafd7cbe1f6b6624a8a 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
@@ -56,7 +56,7 @@ public class PadIndex implements Serializable {
@Override
public String toString() {
- return "PadIndex [id=" + id + ", page=" + page + "]";
+ return id + "-" + page;
}
}