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 96235bf6de5b7347a56ecff96b82d100a3fa9efa..70b3e7185f89ba79375b7aea71edf7677a23dd2a 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties +++ b/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties @@ -69,6 +69,7 @@ settings.update.label.search=Nach Updates suchen: settings.update.label.available=Verf�gbare Updates: settings.update.button.search=Jetzt suchen settings.update.button.install=Aktualisieren und neu starten +settings.update.label.channel=Update Kanal: settings.button.finish=Fertig settings.checkbox.activate=Aktivieren diff --git a/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml b/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml index 91c68b8a000fcfe5f6028a2d03f1ab06a68131cf..19b5d15c0b734339860ec8ccc0d3f24156fe5a39 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml +++ b/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml @@ -5,7 +5,6 @@ <?import java.lang.*?> <?import javafx.scene.layout.*?> - <VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"> <children> <HBox layoutX="14.0" layoutY="14.0" spacing="14.0"> @@ -40,6 +39,12 @@ <ListView fx:id="openUpdateList" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" /> </children> </HBox> + <HBox alignment="CENTER_LEFT" spacing="14.0"> + <children> + <Label prefWidth="150.0" text="%settings.update.label.channel" /> + <ComboBox fx:id="updateChannelComboBox" prefWidth="150.0" /> + </children> + </HBox> <HBox alignment="TOP_RIGHT"> <children> <Button fx:id="updateButton" mnemonicParsing="false" onAction="#updateHandler" text="%settings.update.button.install" /> diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java index 11d526ed177d6722671c7c405659d8a512e8cb40..9d54032cee0862f32a815d2d35b7cf7e6c72a5b7 100644 --- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java +++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java @@ -53,6 +53,8 @@ import de.tobias.playpad.settings.ProfileReference; import de.tobias.playpad.tigger.TriggerRegistry; import de.tobias.playpad.trigger.CartTriggerItemConnect; import de.tobias.playpad.trigger.VolumeTriggerItemConnect; +import de.tobias.playpad.update.Updatable; +import de.tobias.playpad.update.UpdateRegistery; import de.tobias.playpad.view.MapperOverviewViewController; import de.tobias.playpad.viewcontroller.IPadSettingsViewController; import de.tobias.playpad.viewcontroller.ISettingsViewController; diff --git a/PlayWall/src/de/tobias/playpad/PlayPadUpdater.java b/PlayWall/src/de/tobias/playpad/PlayPadUpdater.java index be3582a6293243e6558a733e46fb16159bed89a5..2752b6847292a3ec0ec84256e2fffa99de1b384d 100644 --- a/PlayWall/src/de/tobias/playpad/PlayPadUpdater.java +++ b/PlayWall/src/de/tobias/playpad/PlayPadUpdater.java @@ -8,6 +8,7 @@ import java.nio.file.Path; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import de.tobias.playpad.update.Updatable; import de.tobias.utils.application.App; import de.tobias.utils.application.ApplicationUtils; import de.tobias.utils.util.SystemUtils; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java index 48d27b4b90eba7e5e6e99885433f76cb0fd6494e..fc71247903e77023f9aff5ad4a48985f0aee6a17 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java @@ -1,7 +1,7 @@ package de.tobias.playpad.viewcontroller.cell; import de.tobias.playpad.Strings; -import de.tobias.playpad.Updatable; +import de.tobias.playpad.update.Updatable; import de.tobias.utils.util.Localization; import javafx.scene.control.ListCell; diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java index 0edd9042f39d8a1917d7f57927b18b23d6793074..6861119a6fce149b137ba2dd33c66673ec4ffb6c 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java @@ -15,9 +15,10 @@ import de.tobias.playpad.AppUserInfoStrings; import de.tobias.playpad.PlayPadMain; import de.tobias.playpad.PlayPadPlugin; import de.tobias.playpad.Strings; -import de.tobias.playpad.Updatable; -import de.tobias.playpad.UpdateRegistery; import de.tobias.playpad.settings.Profile; +import de.tobias.playpad.update.Updatable; +import de.tobias.playpad.update.UpdateChannel; +import de.tobias.playpad.update.UpdateRegistery; import de.tobias.playpad.viewcontroller.SettingsTabViewController; import de.tobias.playpad.viewcontroller.cell.UpdateCell; import de.tobias.playpad.viewcontroller.dialog.UpdaterDialog; @@ -35,6 +36,7 @@ import javafx.scene.control.Alert; import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; +import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.ListView; import javafx.scene.control.ProgressIndicator; @@ -58,6 +60,9 @@ public class UpdateTabViewController extends SettingsTabViewController { @FXML private ListView<Updatable> openUpdateList; @FXML private Button updateButton; + @FXML private ComboBox<UpdateChannel> updateChannelComboBox; + + // Placeholder for List private ProgressIndicator progressIndecator; private Label placeholderLabel; @@ -84,6 +89,7 @@ public class UpdateTabViewController extends SettingsTabViewController { @Override public void init() { openUpdateList.setCellFactory(list -> new UpdateCell()); + updateChannelComboBox.getItems().setAll(UpdateChannel.values()); progressIndecator = new ProgressIndicator(-1); progressIndecator.setMinSize(25, 25); diff --git a/PlayWallCore/src/de/tobias/playpad/Updatable.java b/PlayWallCore/src/de/tobias/playpad/update/Updatable.java similarity index 90% rename from PlayWallCore/src/de/tobias/playpad/Updatable.java rename to PlayWallCore/src/de/tobias/playpad/update/Updatable.java index 8ae1166bbd82243e86f5db429da899cbea1e722b..82b9c8c8096f3d0f7fd0811f6654ce0c9d143d33 100644 --- a/PlayWallCore/src/de/tobias/playpad/Updatable.java +++ b/PlayWallCore/src/de/tobias/playpad/update/Updatable.java @@ -1,4 +1,4 @@ -package de.tobias.playpad; +package de.tobias.playpad.update; import java.net.URL; import java.nio.file.Path; diff --git a/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java b/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java new file mode 100644 index 0000000000000000000000000000000000000000..60ea93d2bc6a8643fbabe0b027eb6e8003dc4fcd --- /dev/null +++ b/PlayWallCore/src/de/tobias/playpad/update/UpdateChannel.java @@ -0,0 +1,7 @@ +package de.tobias.playpad.update; + +public enum UpdateChannel { + + STABLE, + BETA; +} diff --git a/PlayWallCore/src/de/tobias/playpad/UpdateRegistery.java b/PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java similarity index 98% rename from PlayWallCore/src/de/tobias/playpad/UpdateRegistery.java rename to PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java index 2ce10162e60434ca84d3b2fa6e355e5cfeb8341a..c3b8b974a0fcdd7479af589b07f1e948f540c35a 100644 --- a/PlayWallCore/src/de/tobias/playpad/UpdateRegistery.java +++ b/PlayWallCore/src/de/tobias/playpad/update/UpdateRegistery.java @@ -1,4 +1,4 @@ -package de.tobias.playpad; +package de.tobias.playpad.update; import java.net.URISyntaxException; import java.util.ArrayList;