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 d850bd408cf7973973d44e069ca3194f817a4e2b..3b641ae8a515b0eaacded11bdf6966734e0d6932 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
@@ -13,141 +13,179 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<VBox maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
- <children>
-<MenuBar fx:id="menuBar" prefHeight="29.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <menus>
- <Menu mnemonicParsing="false" text="%main.menu.file">
- <items>
- <MenuItem fx:id="newProjectMenuItem" mnemonicParsing="false" onAction="#newDocumentHandler" text="%main.menuitem.new">
- <accelerator>
- <KeyCodeCombination alt="UP" code="N" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- <Menu fx:id="recentOpenMenu" mnemonicParsing="false" text="%main.menuitem.recentFiles" />
- <MenuItem fx:id="openProjectMenuItem" mnemonicParsing="false" onAction="#openDocumentHandler" text="%main.menuitem.project">
- <accelerator>
- <KeyCodeCombination alt="UP" code="O" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- <MenuItem fx:id="saveProjectMenuItem" mnemonicParsing="false" onAction="#saveMenuHandler" text="%main.menuitem.save">
- <accelerator>
- <KeyCodeCombination alt="UP" code="S" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem fx:id="profileMenu" mnemonicParsing="false" onAction="#profileMenuHandler" text="%main.menuitem.profile" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem fx:id="printProjectMenuItem" mnemonicParsing="false" onAction="#printMenuHandler" text="%main.menuitem.print">
- <accelerator>
- <KeyCodeCombination alt="UP" code="P" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator></MenuItem>
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="%main.menu.option">
- <items>
- <Menu mnemonicParsing="false" text="%main.menu.editmode">
- <items>
- <MenuItem fx:id="playMenu" mnemonicParsing="false" onAction="#playMenuHandler" text="%main.menuitem.play">
- <accelerator>
- <KeyCodeCombination alt="UP" code="H" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
+<VBox maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
+ xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <MenuBar fx:id="menuBar" prefHeight="29.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1">
+ <menus>
+ <Menu mnemonicParsing="false" text="%main.menu.file">
+ <items>
+ <MenuItem fx:id="newProjectMenuItem" mnemonicParsing="false" onAction="#newDocumentHandler"
+ text="%main.menuitem.new">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="N" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
</MenuItem>
- <MenuItem fx:id="dragMenu" mnemonicParsing="false" onAction="#dragMenuHandler" text="%main.menuitem.drag">
- <accelerator>
- <KeyCodeCombination alt="UP" code="J" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
+ <Menu fx:id="recentOpenMenu" mnemonicParsing="false" text="%main.menuitem.recentFiles"/>
+ <MenuItem fx:id="openProjectMenuItem" mnemonicParsing="false" onAction="#openDocumentHandler"
+ text="%main.menuitem.project">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="O" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
</MenuItem>
- <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>
+ <MenuItem fx:id="saveProjectMenuItem" mnemonicParsing="false" onAction="#saveMenuHandler"
+ text="%main.menuitem.save">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="S" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
</MenuItem>
- <MenuItem fx:id="colorMenu" mnemonicParsing="false" onAction="#colorMenuHandler" text="%main.menuitem.color">
- <accelerator>
- <KeyCodeCombination alt="UP" code="L" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="profileMenu" mnemonicParsing="false" onAction="#profileMenuHandler"
+ text="%main.menuitem.profile"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="printProjectMenuItem" mnemonicParsing="false" onAction="#printMenuHandler"
+ text="%main.menuitem.print">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="P" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
</MenuItem>
- </items>
- </Menu>
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem fx:id="errorMenu" mnemonicParsing="false" onAction="#errorMenuHandler" text="%main.menuitem.errors">
- <accelerator>
- <KeyCodeCombination alt="UP" code="E" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem fx:id="pluginMenu" mnemonicParsing="false" onAction="#pluginMenuItemHandler" text="%main.menuitem.plugins" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem fx:id="projectSettingsMenuItem" mnemonicParsing="false" onAction="#projectSettingsHandler" text="%main.menuitem.projectSettings" />
- <MenuItem fx:id="profileSettingsMenuItem" mnemonicParsing="false" onAction="#profileSettingsHandler" text="%main.menuitem.profileSettings">
- <accelerator>
- <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- <MenuItem fx:id="globalSettingsMenuItem" mnemonicParsing="false" onAction="#globalSettingsHandler" text="%main.menuitem.globalSettings">
- <accelerator>
- <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="DOWN" shortcut="DOWN" />
- </accelerator>
- </MenuItem>
- </items>
- </Menu>
- <Menu fx:id="layoutMenu" mnemonicParsing="false" text="%main.menu.view">
- <items>
- <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>
- <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" />
- <SeparatorMenuItem mnemonicParsing="false" />
- </items>
- </Menu>
- <Menu fx:id="extensionMenu" mnemonicParsing="false" text="%main.menu.extension" />
- <Menu fx:id="infoMenu" mnemonicParsing="false" text="%main.menu.info">
- <items>
- <MenuItem mnemonicParsing="false" onAction="#aboutMenuHandler" text="%main.menuitem.about" />
- <MenuItem mnemonicParsing="false" onAction="#showChangelogMenuHandler" text="%main.menuitem.changelog" />
- <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">
- <items>
- <HBox fx:id="toolbarHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" prefHeight="28.0" prefWidth="586.0" spacing="14.0">
- <children>
- <HBox fx:id="pageHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0" HBox.hgrow="ALWAYS" />
- <HBox fx:id="iconHbox" alignment="CENTER" spacing="14.0">
- <children>
- <Label fx:id="liveLabel" text="%main.label.live" textFill="RED">
- <font>
- <Font size="26.0" />
- </font>
- </Label>
- </children></HBox>
- <HBox fx:id="searchFieldHbox" />
- <HBox alignment="CENTER" spacing="7.0" HBox.hgrow="NEVER">
- <children>
- <Label fx:id="volumeDownLabel">
- <font>
- <Font size="24.0" />
- </font>
- </Label>
- <Slider fx:id="volumeSlider" focusTraversable="false" max="1.0" />
- <Label fx:id="volumeUpLabel">
- <font>
- <Font size="24.0" />
- </font>
- </Label>
- </children>
- </HBox>
- </children>
- </HBox>
- </items>
-</ToolBar>
- </children>
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="%main.menu.option">
+ <items>
+ <Menu mnemonicParsing="false" text="%main.menu.editmode">
+ <items>
+ <MenuItem fx:id="playMenu" mnemonicParsing="false" onAction="#playMenuHandler"
+ text="%main.menuitem.play">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="H" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="dragMenu" mnemonicParsing="false" onAction="#dragMenuHandler"
+ text="%main.menuitem.drag">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="J" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <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>
+ </MenuItem>
+ <MenuItem fx:id="colorMenu" mnemonicParsing="false" onAction="#colorMenuHandler"
+ text="%main.menuitem.color">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="L" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ </items>
+ </Menu>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="errorMenu" mnemonicParsing="false" onAction="#errorMenuHandler"
+ text="%main.menuitem.errors">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="E" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="pluginMenu" mnemonicParsing="false" onAction="#pluginMenuItemHandler"
+ text="%main.menuitem.plugins"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="projectSettingsMenuItem" mnemonicParsing="false"
+ onAction="#projectSettingsHandler" text="%main.menuitem.projectSettings"/>
+ <MenuItem fx:id="profileSettingsMenuItem" mnemonicParsing="false"
+ onAction="#profileSettingsHandler" text="%main.menuitem.profileSettings">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="globalSettingsMenuItem" mnemonicParsing="false"
+ onAction="#globalSettingsHandler" text="%main.menuitem.globalSettings">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="DOWN"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ </items>
+ </Menu>
+ <Menu fx:id="layoutMenu" mnemonicParsing="false" text="%main.menu.view">
+ <items>
+ <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>
+ <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"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ </items>
+ </Menu>
+ <Menu fx:id="extensionMenu" mnemonicParsing="false" text="%main.menu.extension"/>
+ <Menu fx:id="infoMenu" mnemonicParsing="false" text="%main.menu.info">
+ <items>
+ <MenuItem mnemonicParsing="false" onAction="#aboutMenuHandler" text="%main.menuitem.about"/>
+ <MenuItem mnemonicParsing="false" onAction="#showChangelogMenuHandler"
+ text="%main.menuitem.changelog"/>
+ <MenuItem mnemonicParsing="false" onAction="#visiteWebsiteMenuHandler"
+ text="%main.menuitem.website"/>
+ </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">
+ <items>
+ <HBox fx:id="toolbarHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" prefHeight="28.0"
+ prefWidth="586.0" spacing="14.0">
+ <children>
+ <HBox fx:id="pageHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0"
+ HBox.hgrow="ALWAYS"/>
+ <HBox fx:id="iconHbox" alignment="CENTER" spacing="14.0">
+ <children>
+ <Label fx:id="liveLabel" text="%main.label.live" textFill="RED">
+ <font>
+ <Font size="26.0"/>
+ </font>
+ </Label>
+ </children>
+ </HBox>
+ <HBox fx:id="searchFieldHbox"/>
+ <HBox alignment="CENTER" spacing="7.0" HBox.hgrow="NEVER">
+ <children>
+ <Label fx:id="volumeDownLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ <Slider fx:id="volumeSlider" focusTraversable="false" max="1.0"/>
+ <Label fx:id="volumeUpLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ </children>
+ </HBox>
+ </children>
+ </HBox>
+ </items>
+ </ToolBar>
+ </children>
</VBox>
diff --git a/PlayWall/src/application.yml b/PlayWall/src/application.yml
index 0f185c7aad855a32654e86bbf95e0416458ed3d9..008da7b05f08af78a0cf7ea45f9c99ddc07c5a6a 100644
--- a/PlayWall/src/application.yml
+++ b/PlayWall/src/application.yml
@@ -1,6 +1,6 @@
name: PlayWall
-version: 6.1.0
-build: 38
+version: 6.1.1
+build: 39
identifier: de.tobias.playpad.v6
main: de.tobias.playpad.PlayPadMain
author: Tobias Ullerich
@@ -9,8 +9,7 @@ iconPath: icon
updateURL: https://tobisan.ddns.net/playwall/resources/executables
userInfo:
Website: http://tobisan.no-ip.org/
- ErrorURL: http://tobisan.no-ip.org/upload.php
- PluginsURL:
+ PluginsURL:
Stable: https://tobisan.ddns.net/playwall/resources/executables/stable/plugins.yml
Beta: https://tobisan.ddns.net/playwall/resources/executables/beta/plugins.yml
ChangelogURL: https://tobisan.ddns.net/roadmap/php/index.php?id=1
diff --git a/PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java b/PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java
index 892cf27637337f1ed49fcda4b1ebb86f93af78d1..e9a4fdfd60b5fd372d06c104bb505202a1bc77f5 100644
--- a/PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java
+++ b/PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java
@@ -5,7 +5,6 @@ public class AppUserInfoStrings {
public static final String WEBSITE = "Website";
public static final String PLUGINS_URL_STABLE = "PluginsURL.Stable";
public static final String PLUGINS_URL_BETA = "PluginsURL.Beta";
- public static final String ERROR_URL = "ErrorURL";
public static final String CHANGELOG_URL = "ChangelogURL";
public static final String UPDATER_PROGRAM = "UpdaterProgram";
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index eed8a9297df47c2903489d4c9ff3427edb2941c8..1c80c02c40f271ae5894469303cb231bb5d3f667 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -716,29 +716,6 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
}
}
- @FXML
- void sendErrorMenuItem(ActionEvent event) {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.initOwner(mainViewController.getStage());
- alert.initModality(Modality.WINDOW_MODAL);
- Stage dialog = (Stage) alert.getDialogPane().getScene().getWindow();
- PlayPadMain.stageIcon.ifPresent(dialog.getIcons()::add);
- alert.setContentText(Localization.getString(Strings.UI_Dialog_Feedback_Content));
- alert.show();
-
- Worker.runLater(() ->
- {
- try {
- String response = FileUpload.fileUpload(
- ApplicationUtils.getApplication().getInfo().getUserInfo().getString(AppUserInfoStrings.ERROR_URL),
- ApplicationUtils.getApplication().getPath(PathType.LOG, "err.log").toFile());
- Platform.runLater(() -> alert.setContentText(response));
- } catch (IOException e) {
- e.printStackTrace();
- }
- });
- }
-
private static final int LAST_DOCUMENT_LIMIT = 3;
public void createRecentDocumentMenuItems() {
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
index 70cc827e0101fa468233942e5270c31eeb421898..0c4a946395c1a39dac3c0f517c5d51a760c5ab89 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
+++ b/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java
@@ -24,12 +24,12 @@ public class MediaPluginUpdater implements Updatable {
@Override
public int getCurrentBuild() {
- return 7;
+ return 8;
}
@Override
public String getCurrentVersion() {
- return "4.2.1";
+ return "4.2.2";
}
@Override