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 1c152d8540b4a2c2aae51f400625b556b9d4b17e..dd7c7d2aa525e7b2093debec88e177d3f3cdc92f 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
@@ -65,9 +65,8 @@
</MenuItem>
</items>
</Menu>
- <Menu mnemonicParsing="false" text="%main.menu.view">
+ <Menu fx:id="layoutMenu" mnemonicParsing="false" text="%main.menu.view">
<items>
- <Menu fx:id="layoutMenu" mnemonicParsing="false" text="%main.menuitem.layout" />
<CheckMenuItem fx:id="alwaysOnTopItem" mnemonicParsing="false" onAction="#alwaysOnTopItemHandler" text="%main.menuitem.onTop" />
<CheckMenuItem fx:id="fullScreenMenuItem" mnemonicParsing="false" onAction="#fullScreenMenuItemHandler" text="%main.menuitem.fullScreen">
<accelerator>
@@ -75,6 +74,7 @@
</accelerator></CheckMenuItem>
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem fx:id="searchPadMenuItem" mnemonicParsing="false" onAction="#searchPadHandler" text="%main.menuitem.searchPad" />
+ <SeparatorMenuItem mnemonicParsing="false" />
</items>
</Menu>
<Menu fx:id="extensionMenu" mnemonicParsing="false" text="%main.menu.extension" />
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 4f6f43bc724ee1753e8bbc29a691bc57860e5420..0c1425ec0cfb123166db54fa25508b8ac2d0aeea 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -27,6 +27,7 @@ import de.tobias.playpad.settings.Profile;
import de.tobias.playpad.settings.ProfileNotFoundException;
import de.tobias.playpad.settings.ProfileSettings;
import de.tobias.playpad.settings.keys.KeyCollection;
+import de.tobias.playpad.view.HelpMenuItem;
import de.tobias.playpad.view.main.MainLayoutConnect;
import de.tobias.playpad.view.main.MenuType;
import de.tobias.playpad.viewcontroller.dialog.ErrorSummaryDialog;
@@ -51,6 +52,7 @@ import de.tobias.utils.util.Localization;
import de.tobias.utils.util.Worker;
import de.tobias.utils.util.net.FileUpload;
import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -109,7 +111,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
private GlobalSettingsViewController globalSettingsViewController;
public DesktopMenuToolbarViewController(IMainViewController controller) {
- super("header", "de/tobias/playpad/assets/view/main/desktop/", PlayPadMain.getUiResourceBundle(), controller);
+ super("header", "de/tobias/playpad/assets/view/main/desktop/", PlayPadMain.getUiResourceBundle());
this.mainViewController = controller;
initLayoutMenu();
@@ -121,9 +123,12 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
toolbarHBox.prefWidthProperty().bind(toolbar.widthProperty().subtract(25));
toolbarHBox.prefHeightProperty().bind(toolbar.minHeightProperty());
- showLiveInfo(false);
+ // Hide Extension menu then no items are in there
+ extensionMenu.visibleProperty().bind(Bindings.size(extensionMenu.getItems()).greaterThan(0));
- // helpMenu.getItems().add(new HelpMenuItem(helpMenu)); BETA
+ // Help Menu --> HIDDEN TODO
+ helpMenu.setVisible(false);
+ helpMenu.getItems().add(new HelpMenuItem(helpMenu));
}
private void initLayoutMenu() {
@@ -155,8 +160,13 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
@Override
public void setOpenProject(Project project) {
super.setOpenProject(project);
- if (project != null)
+
+ liveLabel.visibleProperty().unbind();
+
+ if (project != null) {
createRecentDocumentMenuItems();
+ liveLabel.visibleProperty().bind(project.activePlayerProperty().greaterThan(0));
+ }
}
@Override
@@ -241,8 +251,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
public void addMenuItem(MenuItem item, MenuType type) {
if (type == MenuType.EXTENSION) {
extensionMenu.getItems().add(item);
- } else if (type == MenuType.SETTINGS) {
- // TODO Implement
}
}
@@ -250,8 +258,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
public void removeMenuItem(MenuItem item) {
if (extensionMenu.getItems().contains(item))
extensionMenu.getItems().remove(item);
-
- // TODO Implement
}
@Override
@@ -281,11 +287,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
}
}
- @Override
- public void showLiveInfo(boolean show) {
- liveLabel.setVisible(show);
- }
-
@Override
public Slider getVolumeSlider() {
return volumeSlider;
@@ -402,9 +403,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
GlobalSettings settings = PlayPadPlugin.getImplementation().getGlobalSettings();
Project currentProject = PlayPadMain.getProgramInstance().getCurrentProject();
- if (settings.isLiveMode() && settings.isLiveModeDrag() && currentProject.getPlayedPlayers() > 0) {
- mainViewController.showLiveInfo();
- } else {
+ if (settings.isLiveMode() && settings.isLiveModeDrag() && currentProject.getActivePlayers() == 0) {
PadDragListener.setDndMode(true);
for (IPadViewV2 view : mainViewController.getPadViews()) {
view.enableDragAndDropDesignMode(true);
@@ -462,8 +461,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
GlobalSettings settings = PlayPadPlugin.getImplementation().getGlobalSettings();
- if (settings.isLiveMode() && settings.isLiveModeSettings() && currentProject.getPlayedPlayers() > 0) {
- mainViewController.showLiveInfo();
+ if (settings.isLiveMode() && settings.isLiveModeSettings() && currentProject.getActivePlayers() > 0) {
return;
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
index 1e5c8fe376966380d0db3f6b9f86df74b6db5239..2983ff620781c591f7ca584330e0568a4eed295e 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
@@ -196,8 +196,7 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand
private void onNew(ActionEvent event) throws NoSuchComponentException {
GlobalSettings settings = PlayPadPlugin.getImplementation().getGlobalSettings();
if (pad.getProject() != null) {
- if (settings.isLiveMode() && settings.isLiveModeFile() && pad.getProject().getPlayedPlayers() > 0) {
- PlayPadPlugin.getImplementation().getMainViewController().showLiveInfo();
+ if (settings.isLiveMode() && settings.isLiveModeFile() && pad.getProject().getActivePlayers() > 0) {
return;
}
}
@@ -264,8 +263,7 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand
if (mvc != null) {
if (pad.getProject() != null) {
- if (settings.isLiveMode() && settings.isLiveModeSettings() && pad.getProject().getPlayedPlayers() > 0) {
- mvc.showLiveInfo();
+ if (settings.isLiveMode() && settings.isLiveModeSettings() && pad.getProject().getActivePlayers() > 0) {
return;
}
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index a1040d05ddbaef2266e2e2eaa49d840d7a7bbdd5..347361cd08b6c8ebde4b661e2259f438e71df8fe 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -3,6 +3,7 @@ package de.tobias.playpad.layout.touch;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.Strings;
+import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.Profile;
import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MainLayoutConnect;
@@ -28,14 +29,12 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
private IMainViewController mainViewController;
public TouchMenuToolbarViewController(IMainViewController mainViewController) {
- super("header", "de/tobias/playpad/assets/view/main/touch/", PlayPadMain.getUiResourceBundle(), mainViewController);
+ super("header", "de/tobias/playpad/assets/view/main/touch/", PlayPadMain.getUiResourceBundle());
this.mainViewController = mainViewController;
toolbarHBox.prefWidthProperty().bind(toolbar.widthProperty().subtract(25));
toolbarHBox.prefHeightProperty().bind(toolbar.minHeightProperty());
- showLiveInfo(false);
-
// Schriftgröße Icons
FontIcon icon = (FontIcon) volumeDownLabel.getGraphic();
icon.setSize(35);
@@ -61,21 +60,26 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void loadKeybinding(KeyCollection keys) {
+ public void setOpenProject(Project project) {
+ super.setOpenProject(project);
+ liveLabel.visibleProperty().unbind();
+ if (project != null) {
+ liveLabel.visibleProperty().bind(project.activePlayerProperty().greaterThan(0));
+ }
}
@Override
- public void setLocked(boolean looked) {
- }
+ public void loadKeybinding(KeyCollection keys) {}
@Override
- public void setAlwaysOnTopActive(boolean alwaysOnTopActive) {
- }
+ public void setLocked(boolean looked) {}
@Override
- public void setFullScreenActive(boolean fullScreenActive) {
- }
+ public void setAlwaysOnTopActive(boolean alwaysOnTopActive) {}
+
+ @Override
+ public void setFullScreenActive(boolean fullScreenActive) {}
@Override
public void addToolbarItem(Node node) {
@@ -88,21 +92,13 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void addMenuItem(MenuItem item, MenuType type) {
- }
-
- @Override
- public void removeMenuItem(MenuItem item) {
- }
+ public void addMenuItem(MenuItem item, MenuType type) {}
@Override
- public void deinit() {
- }
+ public void removeMenuItem(MenuItem item) {}
@Override
- public void showLiveInfo(boolean show) {
- liveLabel.setVisible(show);
- }
+ public void deinit() {}
private int currentPage = 0;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
index ffc8d214bc6b6a0fe0191e4fcaab932078916066..7f7d2de79b4acb530ee57ef4045a2b30678d2cf7 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
@@ -35,12 +35,8 @@ public abstract class BasicMenuToolbarViewController extends MenuToolbarViewCont
protected Project openProject; // REFERENCE zu MainViewController
- // window references
- private IMainViewController mainViewController;
-
- public BasicMenuToolbarViewController(String name, String path, ResourceBundle localization, IMainViewController mainViewController) {
+ public BasicMenuToolbarViewController(String name, String path, ResourceBundle localization) {
super(name, path, localization);
- this.mainViewController = mainViewController;
}
@Override
@@ -59,9 +55,7 @@ public abstract class BasicMenuToolbarViewController extends MenuToolbarViewCont
protected void doAction(Runnable run) {
Project project = PlayPadMain.getProgramInstance().getCurrentProject();
GlobalSettings globalSettings = PlayPadPlugin.getImplementation().getGlobalSettings();
- if (project.getPlayedPlayers() > 0 && globalSettings.isLiveMode()) {
- mainViewController.showLiveInfo();
- } else {
+ if (!(project.getActivePlayers() > 0 && globalSettings.isLiveMode())) {
run.run();
}
}
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index a51ee521c1ea44ae3f0f894c4f59e41e47a32d76..0ce42d323fb9801a5f4ce669bcc701e0d819ea97 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -284,7 +284,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
// Frag den Nutzer ob das Programm wirdklich geschlossen werden sol
// wenn ein Pad noch im Status Play ist
- if (openProject.getPlayedPlayers() > 0 && globalSettings.isLiveMode()) {
+ if (openProject.getActivePlayers() > 0 && globalSettings.isLiveMode()) {
Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setContentText(Localization.getString(Strings.UI_Window_Main_CloseRequest));
@@ -529,28 +529,6 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
}
}
- private boolean shown = false;
-
- @Override
- public void showLiveInfo() {
- if (!shown && menuToolbarViewController != null) {
- menuToolbarViewController.showLiveInfo(true);
- shown = true;
- Worker.runLater(() ->
- {
- try {
- Thread.sleep(PlayPadMain.displayTimeMillis * 2);
- } catch (Exception e) {}
- Platform.runLater(() ->
- {
- if (menuToolbarViewController != null)
- menuToolbarViewController.showLiveInfo(false);
- shown = false;
- });
- });
- }
- }
-
// Settings
@Override
public void reloadSettings(Profile old, Profile currentProfile) {
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
index ae379cc3e200dd8050a7ae2e9e41885f9874b7bb..5d37af62d3c566b6d4f338ed640dc0eb79ddcc04 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
@@ -50,7 +50,7 @@ public class ProfileSettingsViewController extends ViewController implements IPr
super("settingsView", "de/tobias/playpad/assets/view/option/profile/", null, PlayPadMain.getUiResourceBundle());
this.onFinish = onFinish;
- boolean activePlayer = project.hasPlayedPlayers();
+ boolean activePlayer = project.hasActivePlayers();
addTab(new MappingTabViewController());
addTab(new MidiTabViewController());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
index cb1f9111b2f5350804dbccc4ca8a3db767f17d78..6d284bb6d5a013c3a4bdb4fac3ff82cc37c8de99 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
@@ -46,7 +46,7 @@ public class ProjectSettingsViewController extends ViewController implements IPr
this.onFinish = onFinish;
this.project = project;
- boolean activePlayer = project.hasPlayedPlayers();
+ boolean activePlayer = project.hasActivePlayers();
addTab(new GeneralTabViewController(currentScreen, this, activePlayer));
addTab(new PathsTabViewController());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java b/PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java
index 39b3ccfd6c2a3b3c3be5cd36973a9e608d995dfe..5d62dd01256dc58091e4e51f256cfd977282e2e1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java
@@ -63,8 +63,7 @@ public class PadDragListener {
GlobalSettings globalSettings = PlayPadPlugin.getImplementation().getGlobalSettings();
if (sourcePad.getProject() != null) {
- if (globalSettings.isLiveMode() && globalSettings.isLiveModeFile() && sourcePad.getProject().getPlayedPlayers() > 0) {
- PlayPadPlugin.getImplementation().getMainViewController().showLiveInfo();
+ if (globalSettings.isLiveMode() && globalSettings.isLiveModeFile() && sourcePad.getProject().getActivePlayers() > 0) {
return;
}
}
@@ -171,8 +170,7 @@ public class PadDragListener {
GlobalSettings globalSettings = PlayPadPlugin.getImplementation().getGlobalSettings();
if (sourcePad.getProject() != null) {
- if (globalSettings.isLiveMode() && globalSettings.isLiveModeDrag() && sourcePad.getProject().getPlayedPlayers() > 0) {
- PlayPadPlugin.getImplementation().getMainViewController().showLiveInfo();
+ if (globalSettings.isLiveMode() && globalSettings.isLiveModeDrag() && sourcePad.getProject().getActivePlayers() > 0) {
return;
}
}
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadStatusListener.java b/PlayWallCore/src/de/tobias/playpad/pad/PadStatusListener.java
index 1b1d1b500944bfebc167cf393bfdb2e3ee0e84ee..4b35b1dda9738148de908b7ea9e990a397337d82 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/PadStatusListener.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/PadStatusListener.java
@@ -27,6 +27,7 @@ public class PadStatusListener implements ChangeListener<PadStatus> {
if (newValue == PadStatus.PLAY) {
if (pad.getContent() != null) {
PlayPadPlugin.getImplementation().getPadListener().forEach(listener -> listener.onPlay(pad));
+ pad.getProject().increaseActivePlayers();
// bei Single Pad Playing wird das alte Pad beendet.
if (!profileSettings.isMultiplePlayer()) {
@@ -61,6 +62,7 @@ public class PadStatusListener implements ChangeListener<PadStatus> {
} else if (newValue == PadStatus.STOP) {
if (pad.getContent() != null) {
PlayPadPlugin.getImplementation().getPadListener().forEach(listener -> listener.onStop(pad));
+ pad.getProject().dereaseActivePlayers();
if (pad.getContent() instanceof Fadeable && !pad.isEof() && padSettings.getFade().isFadeOutStop()) { // Fade nur wenn Pad
// nicht am ende ist
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index 3baccb5b62dc8b132692af7a6f3ec9bd1c554533..07f36d89fd320ef3579eccdff07d521c3e7e8b2b 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -15,12 +15,14 @@ import org.dom4j.Element;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadException;
import de.tobias.playpad.pad.PadSerializer;
-import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.settings.Profile;
import de.tobias.playpad.settings.ProfileNotFoundException;
import de.tobias.playpad.xml.XMLHandler;
import javafx.application.Platform;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
@@ -35,7 +37,7 @@ public class Project {
/**
* Pattern für den Namen des Projekts
*/
- public static final String PROJECT_NAME_PATTERN = "\\w{1}[\\w\\s-_]{0,}";
+ public static final String PROJECT_NAME_PATTERN = "[\\p{L},0-9]{1}[\\p{L}\\s-_]{0,}";
/**
* Dateiendung für eine projekt Datei
*/
@@ -57,6 +59,8 @@ public class Project {
*/
private transient ObservableList<PadException> exceptions;
+ private transient IntegerProperty activePlayers;
+
/**
* Erstellt ein neues leeres Projekt mit einer Referenz.
*
@@ -69,6 +73,7 @@ public class Project {
this.settings = new ProjectSettings();
this.exceptions = FXCollections.observableArrayList();
+ this.activePlayers = new SimpleIntegerProperty();
}
/**
@@ -204,18 +209,25 @@ public class Project {
return pads;
}
- public int getPlayedPlayers() {
- int count = 0;
- for (Pad pad : pads.values()) {
- if (pad.getStatus() == PadStatus.PLAY || pad.getStatus() == PadStatus.PAUSE) {
- count++;
- }
- }
- return count;
+ public int getActivePlayers() {
+ return activePlayers.get();
+ }
+
+ public boolean hasActivePlayers() {
+ return getActivePlayers() > 0;
+ }
+
+ public void increaseActivePlayers() {
+ activePlayers.set(getActivePlayers() + 1);
+ }
+
+ public void dereaseActivePlayers() {
+ if (activePlayers.greaterThan(0).get())
+ activePlayers.set(getActivePlayers() - 1);
}
- public boolean hasPlayedPlayers() {
- return getPlayedPlayers() > 0;
+ public ReadOnlyIntegerProperty activePlayerProperty() {
+ return activePlayers;
}
// Exceptions
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/Profile.java b/PlayWallCore/src/de/tobias/playpad/settings/Profile.java
index 4a1e2e9ccfe32200cab44281ea33b4c34897ae21..2516305ee7b7e610aa892aeb91666cbbbabcd942 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/Profile.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Profile.java
@@ -26,7 +26,7 @@ public class Profile {
private static final String MAPPING_XML = "Mapping.xml";
private static final String LAYOUT_XML = "Layout.xml";
- public static final String profileNameEx = "\\w{1}[\\w\\s-_]{0,}";
+ public static final String profileNameEx = "[\\p{L},0-9]{1}[\\p{L}\\s-_]{0,}";
private static List<ProfileListener> listeners = new ArrayList<>();
private static Profile currentProfile;
diff --git a/PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java b/PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java
index edcb7f5f3b4bb8ab646db90c585ee740ecc5525f..14080aec095ee64fe3c2d589a486cf754a4b7d5a 100644
--- a/PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java
+++ b/PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java
@@ -3,5 +3,4 @@ package de.tobias.playpad.view.main;
public enum MenuType {
EXTENSION,
- SETTINGS;
}
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
index 9a39e8f621ae3d2d0e4b71fe59139025a68b3bd7..0e5e1519ef9a4ab74281b74949b96b08c09d9b23 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
+++ b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
@@ -104,14 +104,6 @@ public interface IMainViewController extends NotificationHandler {
*/
public void loadUserCss();
- /**
- * Zeigt einen Hinweis, wenn eine Aktion versucht wird zu machen, wie während der Wiedergabe eines Pads nicht erlaubt ist. Die Methode
- * delegiert an die Toolbar weiter.
- *
- * @see MenuToolbarViewController#showLiveInfo(boolean)
- */
- public void showLiveInfo();
-
/**
* Gibt die PadViews zurück.
*
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
index 678a9ff8d28c0721049b7a3e765b8af107ca8d71..d6606a8ae9bca7dc1b29260b908c0b9493066cb7 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
+++ b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
@@ -49,8 +49,8 @@ public abstract class MenuToolbarViewController extends ContentViewController {
}
/**
- * Wird von MainViwController aufgerufen, wenn die Buttons für die einzelnen Seiten neu erstellt werden müssen. Das ist der Fall beim laden
- * eines Projektes und bei Änderungen an den Einstellungen.
+ * Wird von MainViwController aufgerufen, wenn die Buttons für die einzelnen Seiten neu erstellt werden müssen. Das ist der Fall beim
+ * laden eines Projektes und bei Änderungen an den Einstellungen.
*/
public abstract void initPageButtons();
@@ -140,14 +140,6 @@ public abstract class MenuToolbarViewController extends ContentViewController {
// Utils
- /**
- * Zeigt den Hinweis LiveModus, und signalisiert dem Nutzer, das eine Aktion blokciert ist.
- *
- * @param show
- * <code>true</code> Hinweis Aktiv
- */
- public abstract void showLiveInfo(boolean show);
-
/**
* Hebt dem Page Button der Aktiv ist hervor. Gleichzeitig wird der vorherige Button nicht mehr Hervorgehebt.
*