diff --git a/PlayWall/assets/de/tobias/playpad/assets/style/touch.css b/PlayWall/assets/de/tobias/playpad/assets/style/touch.css
index 8b0042dd68f072011635e896e94582bc1e428c15..7c3f13e0e822b0adf8dd956e163a68d8e29eedab 100644
--- a/PlayWall/assets/de/tobias/playpad/assets/style/touch.css
+++ b/PlayWall/assets/de/tobias/playpad/assets/style/touch.css
@@ -12,11 +12,11 @@
}
.slider .track {
- -fx-pref-height:20;
+ -fx-pref-height: 15;
}
.slider:vertical .track {
- -fx-pref-width:20;
+ -fx-pref-width: 20;
}
.slider .thumb {
diff --git a/PlayWall/assets/de/tobias/playpad/assets/view/main/touch/header.fxml b/PlayWall/assets/de/tobias/playpad/assets/view/main/touch/header.fxml
index 97a767c4076cd823fb0e56c64fe24e18c1263580..4064a2aea4283892bda5ab3357fed8f40564699f 100644
--- a/PlayWall/assets/de/tobias/playpad/assets/view/main/touch/header.fxml
+++ b/PlayWall/assets/de/tobias/playpad/assets/view/main/touch/header.fxml
@@ -34,19 +34,7 @@
<Font size="24.0" />
</font>
</Label>
- <MenuButton focusTraversable="false" mnemonicParsing="false" text="...">
- <items>
- <CheckMenuItem fx:id="fullScreenMenuItem" mnemonicParsing="false" onAction="#fullScreenMenuItemHandler" text="%main.menuitem.fullScreen">
- <accelerator>
- <KeyCodeCombination alt="UP" code="F" control="UP" meta="UP" shift="DOWN" shortcut="DOWN" />
- </accelerator></CheckMenuItem>
- <CheckMenuItem fx:id="alwaysOnTopItem" mnemonicParsing="false" onAction="#alwaysOnTopItemHandler" text="%main.menuitem.onTop" />
- <MenuItem fx:id="closeMenuItem" mnemonicParsing="false" onAction="#closeMenuItemHandler" text="%main.menuitem.close">
- <accelerator>
- <KeyCodeCombination alt="UP" code="W" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator></MenuItem>
- </items>
- </MenuButton>
+ <Button fx:id="closeButton" focusTraversable="false" mnemonicParsing="false" onAction="#closeMenuItemHandler" text="X" />
</children>
</HBox>
</children>
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 745090a63cc1286e44f58d74bc033bb6c97a7bb4..2755516b8dcee7669dae7cadcfd72d046027d1d0 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -276,16 +276,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
// TODO Implement
}
- @Override
- public boolean isAlwaysOnTopActive() {
- return alwaysOnTopItem.isSelected();
- }
-
- @Override
- public boolean isFullscreenActive() {
- return fullScreenMenuItem.isSelected();
- }
-
@Override
public void deinit() {
newProjectMenuItem.setDisable(true);
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index 214f5b3e63ffee6df6beef812a2f009e744a4cc6..a1040d05ddbaef2266e2e2eaa49d840d7a7bbdd5 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -15,16 +15,13 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Button;
-import javafx.scene.control.CheckMenuItem;
import javafx.scene.control.Label;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Slider;
public class TouchMenuToolbarViewController extends BasicMenuToolbarViewController {
- @FXML protected CheckMenuItem fullScreenMenuItem;
- @FXML protected CheckMenuItem alwaysOnTopItem;
- @FXML protected MenuItem closeMenuItem;
+ @FXML protected Button closeButton;
@FXML protected Label liveLabel;
@@ -69,16 +66,15 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void setLocked(boolean looked) {}
+ public void setLocked(boolean looked) {
+ }
@Override
public void setAlwaysOnTopActive(boolean alwaysOnTopActive) {
- alwaysOnTopItem.setSelected(alwaysOnTopActive);
}
@Override
public void setFullScreenActive(boolean fullScreenActive) {
- fullScreenMenuItem.setSelected(fullScreenActive);
}
@Override
@@ -92,23 +88,16 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void addMenuItem(MenuItem item, MenuType type) {}
-
- @Override
- public void removeMenuItem(MenuItem item) {}
-
- @Override
- public boolean isAlwaysOnTopActive() {
- return alwaysOnTopItem.isSelected();
+ public void addMenuItem(MenuItem item, MenuType type) {
}
@Override
- public boolean isFullscreenActive() {
- return fullScreenMenuItem.isSelected();
+ public void removeMenuItem(MenuItem item) {
}
@Override
- public void deinit() {}
+ public void deinit() {
+ }
@Override
public void showLiveInfo(boolean show) {
@@ -139,19 +128,6 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
// Event Handler
- @FXML
- void alwaysOnTopItemHandler(ActionEvent event) {
- boolean selected = alwaysOnTopItem.isSelected();
-
- mainViewController.getStage().setAlwaysOnTop(selected);
- Profile.currentProfile().getProfileSettings().setWindowAlwaysOnTop(selected);
- }
-
- @FXML
- void fullScreenMenuItemHandler(ActionEvent event) {
- mainViewController.getStage().setFullScreen(fullScreenMenuItem.isSelected());
- }
-
@FXML
void closeMenuItemHandler(ActionEvent event) {
MainLayoutConnect defaultLayout = PlayPadPlugin.getRegistryCollection().getMainLayouts().getDefault();
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index 8d1bd57eea8f55e6a701e01fdc18d9af20ea9953..365d35bf5a8da9221687645b99e365376fea0f40 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -113,7 +113,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
setMainLayout(new DesktopMainLayoutConnect()); // DEBUG
initMapper(openProject);
-
+
Profile.registerListener(this);
reloadSettings(null, Profile.currentProfile());
@@ -196,6 +196,7 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
private void initMainLayout() {
ProfileSettings settings = Profile.currentProfile().getProfileSettings();
+ // Entfernt Volume listener
if (menuToolbarViewController != null) {
menuToolbarViewController.deinit();
@@ -203,20 +204,17 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
menuToolbarViewController.getVolumeSlider().valueProperty().removeListener(volumeChangeListener);
}
+ // Erstellt Neue Toolbar
headerBox.getChildren().clear();
MenuToolbarViewController newMenuToolbarViewController = mainLayout.createMenuToolbar(this);
headerBox.getChildren().add(newMenuToolbarViewController.getParent());
- // Kopiert alte Einstellungen
- if (menuToolbarViewController != null) {
- newMenuToolbarViewController.setAlwaysOnTopActive(this.menuToolbarViewController.isAlwaysOnTopActive());
- newMenuToolbarViewController.setFullScreenActive(this.menuToolbarViewController.isFullscreenActive());
- }
-
+ // Führt alle Listener für diesen neuen Controller aus, damit Buttons und co wieder erstellt werden können
layoutChangedListener.handle(layoutActions, this.menuToolbarViewController, newMenuToolbarViewController);
this.menuToolbarViewController = newMenuToolbarViewController;
menuToolbarViewController.setOpenProject(openProject);
+ // Neue Volume listener
menuToolbarViewController.getVolumeSlider().valueProperty().bindBidirectional(settings.volumeProperty());
menuToolbarViewController.getVolumeSlider().valueProperty().addListener(volumeChangeListener);
@@ -228,9 +226,9 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
ProfileSettings profileSettings = Profile.currentProfile().getProfileSettings();
lockedListener.changed(profileSettings.lockedProperty(), !profileSettings.isLocked(), profileSettings.isLocked());
+ // Zeigt aktuelle Daten an
createPadViews();
showPage(currentPageShowing);
-
loadUserCss();
}
@@ -537,7 +535,8 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
{
try {
Thread.sleep(PlayPadMain.displayTimeMillis * 2);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
Platform.runLater(() ->
{
if (menuToolbarViewController != null)
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java b/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
index 2df87e3723b44664544e0e5f1310bcac558a7b39..678a9ff8d28c0721049b7a3e765b8af107ca8d71 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();
@@ -126,20 +126,6 @@ public abstract class MenuToolbarViewController extends ContentViewController {
* Getter
*/
- /**
- * Gibt die Einstellung zurück, ob AlwaysOnTop Aktiv ist.
- *
- * @return <code>true</code> Aktiv
- */
- public abstract boolean isAlwaysOnTopActive();
-
- /**
- * Gibt die Einstellung zurück, ob Fullscreen Aktiv ist.
- *
- * @return <code>true</code> Aktiv
- */
- public abstract boolean isFullscreenActive();
-
/**
* Deinitialisiert den Controller.
*/
@@ -183,7 +169,8 @@ public abstract class MenuToolbarViewController extends ContentViewController {
/**
* Setzt eine Refernce des aktuellen Projectes auf den ViewController.
*
- * @param project neues Project
+ * @param project
+ * neues Project
*/
public abstract void setOpenProject(Project project);
}