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 47b3ca8394b5967a3d91c2933efd33959882dd22..073819277159c23cc022a3c8eab2aa9da87397d9 100644
--- a/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties
+++ b/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties
@@ -5,6 +5,7 @@ main.menu.option=Optionen
main.menu.view=Ansicht
main.menu.info=Info
main.menu.extension=Erweitert
+main.menu.help=Hilfe
main.menuitem.new=Neues Projekt...
main.menuitem.project=Projekte verwalten...
@@ -24,6 +25,7 @@ main.menuitem.senderror=Fehler senden...
main.menuitem.fullScreen=Vollbild
main.menuitem.layout=Layout
main.menuitem.close=Touch Modus schlie�en
+main.menuitem.searchPad=Kachel suchen...
main.label.live=Live
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 28fd4171e78dfaae93f973a26f6e21f1c64c1f94..df64599e49b9d652ec185132b564556c386e34a3 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
@@ -72,16 +72,19 @@
<accelerator>
<KeyCodeCombination alt="UP" code="F" control="UP" meta="UP" shift="DOWN" shortcut="DOWN" />
</accelerator></CheckMenuItem>
+ <SeparatorMenuItem mnemonicParsing="false" />
+ <MenuItem fx:id="searchPadMenuItem" mnemonicParsing="false" onAction="#searchPadHandler" text="%main.menuitem.searchPad" />
</items>
</Menu>
<Menu fx:id="extensionMenu" mnemonicParsing="false" text="%main.menu.extension" />
- <Menu mnemonicParsing="false" text="%main.menu.info">
+ <Menu fx:id="infoMenu" mnemonicParsing="false" text="%main.menu.info">
<items>
<MenuItem mnemonicParsing="false" onAction="#aboutMenuHandler" text="%main.menuitem.about" />
<MenuItem mnemonicParsing="false" onAction="#visiteWebsiteMenuHandler" text="%main.menuitem.website" />
<MenuItem mnemonicParsing="false" onAction="#sendErrorMenuItem" text="%main.menuitem.senderror" />
</items>
</Menu>
+ <Menu fx:id="helpMenu" mnemonicParsing="false" text="%main.menu.help" />
</menus>
</MenuBar>
<ToolBar fx:id="toolbar" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
@@ -97,6 +100,7 @@
</font>
</Label>
</children></HBox>
+ <HBox fx:id="searchFieldHbox" />
<HBox alignment="CENTER" spacing="7.0" HBox.hgrow="NEVER">
<children>
<Label fx:id="volumeDownLabel">
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java b/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
index a6c34ec5152583598c758263c1680f1694b25c42..7f1cee36c2cf53eda66aa443c049aa8fd576d7eb 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
+++ b/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
@@ -9,6 +9,7 @@ import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.Profile;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import javafx.event.EventHandler;
+import javafx.scene.Scene;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
@@ -28,26 +29,27 @@ public class KeyboardHandler implements EventHandler<KeyEvent> {
// KeyType ist nicht unterstützt.
@Override
public void handle(KeyEvent event) {
- if (!event.isShortcutDown()) {
- KeyCode code = null;
- InputType type = null;
+ if (event.getTarget() instanceof Scene) { // TEST Ob Probleme da sind, wegen Fokus und so
+ if (!event.isShortcutDown()) {
+ KeyCode code = null;
+ InputType type = null;
- if (event.getEventType() == KeyEvent.KEY_PRESSED) {
- code = event.getCode();
- type = InputType.PRESSED;
+ if (event.getEventType() == KeyEvent.KEY_PRESSED) {
+ code = event.getCode();
+ type = InputType.PRESSED;
- } else if (event.getEventType() == KeyEvent.KEY_RELEASED) {
- code = event.getCode();
- type = InputType.RELEASED;
+ } else if (event.getEventType() == KeyEvent.KEY_RELEASED) {
+ code = event.getCode();
+ type = InputType.RELEASED;
- }
+ }
- // Only execute this, then the right event is triggered and this var is set
- if (code != null) {
- List<Action> actions = MappingUtils.getActionsForKey(code,
- Profile.currentProfile().getMappings().getActiveMapping());
+ // Only execute this, then the right event is triggered and this var is set
+ if (code != null) {
+ List<Action> actions = MappingUtils.getActionsForKey(code, Profile.currentProfile().getMappings().getActiveMapping());
- executeActions(type, actions);
+ executeActions(type, actions);
+ }
}
}
}
diff --git a/PlayWall/src/de/tobias/playpad/components/Keys.xml b/PlayWall/src/de/tobias/playpad/components/Keys.xml
index e874f5b9c11597c4fa3517008958ac6d867cba9b..23b7dabb82853c7f34a41fc89055920fa8f9d483 100644
--- a/PlayWall/src/de/tobias/playpad/components/Keys.xml
+++ b/PlayWall/src/de/tobias/playpad/components/Keys.xml
@@ -13,6 +13,7 @@
<Key id="window_top" name="main.menuitem.onTop"/>
<Key id="window_fullscreen" name="main.menuitem.fullScreen" key="F" ctrl="true" alt="false" meta="false" shift="true"/>
+ <Key id="search_pad" name="main.menuitem.searchPad" key="F" ctrl="true" alt="false" meta="false" shift="false"/>
</Windows>
<Mac>
<Key id="new_proj" name="main.menuitem.new" key="N" ctrl="false" alt="false" meta="true" shift="false"/>
@@ -28,5 +29,6 @@
<Key id="window_top" name="main.menuitem.onTop"/>
<Key id="window_fullscreen" name="main.menuitem.fullScreen" key="F" ctrl="false" alt="false" meta="true" shift="true"/>
+ <Key id="search_pad" name="main.menuitem.searchPad" key="F" ctrl="false" alt="false" meta="true" shift="false"/>
</Mac>
</Keys>
\ No newline at end of file
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 9551d0207c7931c10755ec444b31d14116312135..4ddc191b8076cf0cfd466041691271a944d17143 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -5,12 +5,17 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.controlsfx.control.textfield.TextFields;
import de.tobias.playpad.AppUserInfoStrings;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.Strings;
import de.tobias.playpad.midi.Midi;
+import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.pad.view.IPadViewV2;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.project.ProjectNotFoundException;
@@ -22,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.ImportDialog;
@@ -41,6 +47,7 @@ import de.tobias.utils.application.ApplicationInfo;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
import de.tobias.utils.ui.Alertable;
+import de.tobias.utils.ui.scene.NotificationPane;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.Worker;
import de.tobias.utils.util.net.FileUpload;
@@ -48,6 +55,7 @@ import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
+import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
@@ -59,8 +67,10 @@ import javafx.scene.control.MenuBar;
import javafx.scene.control.MenuItem;
import javafx.scene.control.RadioMenuItem;
import javafx.scene.control.Slider;
+import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup;
import javafx.scene.input.KeyCombination;
+import javafx.scene.layout.HBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
@@ -83,10 +93,13 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
@FXML protected CheckMenuItem fullScreenMenuItem;
@FXML protected CheckMenuItem alwaysOnTopItem;
+ @FXML protected MenuItem searchPadMenuItem;
@FXML protected Menu layoutMenu;
@FXML protected Menu extensionMenu;
+ @FXML protected Menu infoMenu;
+ @FXML protected Menu helpMenu;
@FXML protected Label liveLabel;
@@ -98,11 +111,17 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
super("header", "de/tobias/playpad/assets/view/main/desktop/", PlayPadMain.getUiResourceBundle(), controller);
this.mainViewController = controller;
+ initLayoutMenu();
+ }
+
+ @Override
+ public void init() {
toolbarHBox.prefWidthProperty().bind(toolbar.widthProperty().subtract(25));
toolbarHBox.prefHeightProperty().bind(toolbar.minHeightProperty());
showLiveInfo(false);
- initLayoutMenu();
+
+ helpMenu.getItems().add(new HelpMenuItem(helpMenu));
}
private void initLayoutMenu() {
@@ -178,6 +197,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
setKeyBindinfForMenu(fullScreenMenuItem, keys.getKey("window_fullscreen"));
setKeyBindinfForMenu(alwaysOnTopItem, keys.getKey("window_top"));
+ setKeyBindinfForMenu(searchPadMenuItem, keys.getKey("search_pad"));
newProjectMenuItem.setDisable(false);
openProjectMenuItem.setDisable(false);
@@ -192,6 +212,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
fullScreenMenuItem.setDisable(false);
alwaysOnTopItem.setDisable(false);
+ searchPadMenuItem.setDisable(false);
}
@Override
@@ -261,6 +282,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
fullScreenMenuItem.setDisable(true);
alwaysOnTopItem.setDisable(true);
+ searchPadMenuItem.setDisable(true);
// Disable Drag Mode wenn aktiv und diese Toolbar deaktiviert wird.
if (dndModeMenuItem.isSelected()) {
@@ -284,7 +306,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
private int currentPage = 0;
@Override
- public void hilightPageButton(int index) {
+ public void highlightPageButton(int index) {
if (index >= 0) {
if (pageHBox.getChildren().size() > currentPage) {
Node removeNode = pageHBox.getChildren().get(currentPage);
@@ -506,6 +528,27 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
mainViewController.getStage().setFullScreen(fullScreenMenuItem.isSelected());
}
+ @FXML
+ void searchPadHandler(ActionEvent event) {
+ TextField field = TextFields.createClearableTextField();
+ field.setPromptText("Suche"); // TODO i18n
+
+ Button button = new Button("Suchen"); // TODO i18n
+ button.setOnAction(new DesktopSearchController(field, this));
+
+ HBox box = new HBox(14, field, button);
+ box.setAlignment(Pos.CENTER_LEFT);
+
+ NotificationPane pane = mainViewController.getNotificationPane();
+ pane.show("", box);
+
+ // Auto Complete
+ Project currentProject = PlayPadMain.getProgramInstance().getCurrentProject();
+ Set<String> names = currentProject.getPads().values().stream().filter(p -> p.getStatus() != PadStatus.EMPTY).map(p -> p.getName())
+ .collect(Collectors.toSet());
+ TextFields.bindAutoCompletion(field, names);
+ }
+
@FXML
void aboutMenuHandler(ActionEvent event) {
ApplicationInfo info = ApplicationUtils.getApplication().getInfo();
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
index 795110a571af780e77df69c91bc26b4bd8844226..9ffa83c104c6005bc0a4c4fede3c08de02c389ef 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
@@ -2,6 +2,9 @@ package de.tobias.playpad.layout.desktop;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.PseudoClasses;
+import de.tobias.playpad.design.FadeableColor;
+import de.tobias.playpad.design.modern.ModernColor;
+import de.tobias.playpad.design.modern.ModernDesignAnimator;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadContentRegistry;
import de.tobias.playpad.pad.conntent.PadContent;
@@ -28,6 +31,7 @@ import javafx.scene.layout.Priority;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
+import javafx.util.Duration;
public class DesktopPadView implements IPadViewV2 {
@@ -362,6 +366,14 @@ public class DesktopPadView implements IPadViewV2 {
root.getStyleClass().add("pad-root");
}
+ @Override
+ public void highlightView(int milliSecounds) {
+ FadeableColor stopColor = new FadeableColor(ModernColor.GRAY1.getColorHi(), ModernColor.GRAY1.getColorLow());
+ FadeableColor playColor = new FadeableColor(ModernColor.BLUE1.getColorHi(), ModernColor.BLUE1.getColorLow());
+
+ ModernDesignAnimator.animateWarn(controller, stopColor, playColor, Duration.seconds(2));
+ }
+
public void clearIndex() {
indexLabel.setText("");
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
new file mode 100644
index 0000000000000000000000000000000000000000..dbe3475f6d5e2b6a56eafb54f4577c7a737fe9a2
--- /dev/null
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
@@ -0,0 +1,51 @@
+package de.tobias.playpad.layout.desktop;
+
+import de.tobias.playpad.PlayPadMain;
+import de.tobias.playpad.PlayPadPlugin;
+import de.tobias.playpad.pad.Pad;
+import de.tobias.playpad.pad.PadStatus;
+import de.tobias.playpad.project.Project;
+import de.tobias.utils.ui.Alertable;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.control.TextField;
+
+public class DesktopSearchController implements EventHandler<ActionEvent> {
+
+ private TextField textField;
+ private Alertable alertable;
+
+ public DesktopSearchController(TextField textField, Alertable alertable) {
+ this.textField = textField;
+ this.alertable = alertable;
+ }
+
+ private int currentIndex = 0;
+
+ @Override
+ public void handle(ActionEvent event) {
+ if (textField.getText().isEmpty()) {
+ return;
+ }
+
+ Project currentProject = PlayPadMain.getProgramInstance().getCurrentProject();
+ main: for (int i = currentIndex; i < currentProject.getPadCount(); i++) {
+ Pad pad = currentProject.getPad(i);
+ if (pad.getStatus() != PadStatus.EMPTY) {
+ if (pad.getName().startsWith(textField.getText())) {
+ while (pad.getController() == null) {
+ if (!PlayPadPlugin.getImplementation().getMainViewController()
+ .showPage(PlayPadPlugin.getImplementation().getMainViewController().getPage() + 1)) {
+ break main;
+ }
+ }
+ pad.getController().getView().highlightView(3);
+ currentIndex = i + 1;
+ return;
+ }
+ }
+ }
+ alertable.showInfoMessage("Keine weiteren Treffer gefunden.", PlayPadMain.stageIcon.orElse(null)); // TODO i18n
+ currentIndex = 0;
+ }
+}
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index cc38aada38590f189e598adee5e17670ad766a1b..ead8c3dd332e2cf164c82957f6721c162719921f 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -117,7 +117,7 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
private int currentPage = 0;
@Override
- public void hilightPageButton(int index) {
+ public void highlightPageButton(int index) {
if (index >= 0) {
if (pageHBox.getChildren().size() > currentPage) {
Node removeNode = pageHBox.getChildren().get(currentPage);
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
index 0b54082236cb6a5ea2cb093d9f67a53fa0a65d47..f99a12deec254cb04a0b628916524d5a88dd9746 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
@@ -260,6 +260,11 @@ public class TouchPadView implements IPadViewV2 {
root.getStyleClass().add("pad-root");
}
+ @Override
+ public void highlightView(int milliSecounds) {
+
+ }
+
public void clearIndex() {
indexLabel.setText("");
}
diff --git a/PlayWall/src/de/tobias/playpad/view/HelpMenuItem.java b/PlayWall/src/de/tobias/playpad/view/HelpMenuItem.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf8e4f9aa04fe6cdad26acecd31e36811ff70774
--- /dev/null
+++ b/PlayWall/src/de/tobias/playpad/view/HelpMenuItem.java
@@ -0,0 +1,51 @@
+package de.tobias.playpad.view;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Pos;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.Label;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+
+/**
+ * Hilfe Menü.
+ *
+ * @author tobias
+ *
+ * @since 5.1.0
+ */
+public class HelpMenuItem extends CustomMenuItem implements ChangeListener<String> {
+
+ private Menu helpMenu;
+
+ public HelpMenuItem(Menu parentMenu) {
+ this.helpMenu = parentMenu;
+
+ setHideOnClick(false);
+
+ Label label = new Label("Suchen nach (Beta): "); // TODO i18n
+ TextField textfield = new TextField();
+ textfield.textProperty().addListener(this);
+
+ HBox hbox = new HBox(14, label, textfield);
+ hbox.setAlignment(Pos.CENTER_LEFT);
+ setContent(hbox);
+ }
+
+ private void clearMenu() {
+ helpMenu.getItems().removeIf(i -> i != this);
+ }
+
+ @Override
+ public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+ clearMenu();
+
+ for (char c : newValue.toCharArray()) {
+ MenuItem item = new MenuItem(String.valueOf(c));
+ helpMenu.getItems().add(item);
+ }
+ }
+}
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index d1eb43303d7f411b344626a2db2ac48686b27021..602e24ce38884e721d920db1385daa5341f39e47 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -479,10 +479,14 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
}
@Override
- public void showPage(int page) {
+ public boolean showPage(int page) {
+ Profile profile = Profile.currentProfile();
+ if (page < 0 || page >= profile.getProfileSettings().getPageCount()) {
+ return false;
+ }
+
// Clean
removePadsFromView();
- // Page Button Remove highlight
this.currentPageShowing = page;
@@ -492,8 +496,9 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
}
if (menuToolbarViewController != null) {
- menuToolbarViewController.hilightPageButton(page);
+ menuToolbarViewController.highlightPageButton(page);
}
+ return true;
}
@Override
@@ -734,4 +739,9 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
runnable.handle(null, menuToolbarViewController);
layoutActions.add(runnable);
}
+
+ @Override
+ public NotificationPane getNotificationPane() {
+ return notificationPane;
+ }
}
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
index 32942fd3633cc902d68802feaddc01446bd2c5ff..db3369ebf25d267a6899d7374e3d0247227c5acf 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
@@ -78,6 +78,14 @@ public interface IPadViewV2 {
*/
public void setStyle(String string);
+ /**
+ * Hebt eine Kachel hervor (Beispiel mit einer Animation.
+ *
+ * @param milliSecounds
+ * Dauer in Millisekunden
+ */
+ public void highlightView(int milliSecounds);
+
/**
* Aktiviert des Error Labels, damit es angezeigt wird.
*
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index 25c0ce199633a55ef65b37cf4af3df23028f3363..b4176e4ac02a2f24528aca18fbc5ce585c8b53ab 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -236,4 +236,8 @@ public class Project {
public String toString() {
return ref.getName() + " (" + ref.getUuid() + ")";
}
+
+ public int getPadCount() {
+ return pads.size();
+ }
}
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
index 5a2331e2bc07205871230830573eae9c6effbf70..9a39e8f621ae3d2d0e4b71fe59139025a68b3bd7 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
+++ b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
@@ -8,6 +8,7 @@ import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MainLayoutConnect;
import de.tobias.playpad.view.main.MainLayoutHandler;
import de.tobias.utils.ui.NotificationHandler;
+import de.tobias.utils.ui.scene.NotificationPane;
import javafx.event.EventHandler;
import javafx.event.EventType;
import javafx.scene.Parent;
@@ -94,8 +95,9 @@ public interface IMainViewController extends NotificationHandler {
*
* @param page
* Page Number
+ * @return <code>false</code> Seite gibt es nicht.
*/
- public void showPage(int page);
+ public boolean showPage(int page);
/**
* Lädt die CSS Files neu.
@@ -156,4 +158,11 @@ public interface IMainViewController extends NotificationHandler {
* Einstellungen der Key Bindings
*/
public void loadKeybinding(KeyCollection keys);
+
+ /**
+ * Gibt das NotificationPane zurück.
+ *
+ * @return NotificationPane
+ */
+ public NotificationPane getNotificationPane();
}
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
index 623ba4aadac4676dd2628e1ef48d8fff2bea9cee..f8369fb089361c7c8195a58431ccc721510c53e9 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
+++ b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
@@ -169,7 +169,7 @@ public abstract class MenuToolbarViewController extends ContentViewController {
*
* @see IMainViewController#showPage(int)
*/
- public abstract void hilightPageButton(int page);
+ public abstract void highlightPageButton(int page);
/**
* Lädt das Keyboard Binding.