diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java index 96dbb5e357c5391b4fbb5b985af2c70ba66154dc..25aa0e209efc0ded8188ae099035c2010414ff5a 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java @@ -21,7 +21,6 @@ import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; -import javafx.scene.image.ImageView; import java.io.IOException; @@ -43,11 +42,6 @@ public class UpdateTabViewController extends GlobalSettingsTabViewController { @FXML private ComboBox<UpdateService.RepositoryType> updateChannelComboBox; - @FXML - private Label infoCLabel; - @FXML - private Label infoELabel; - // Placeholder for List private ProgressIndicator progressIndicator; private Label placeholderLabel; @@ -81,9 +75,6 @@ public class UpdateTabViewController extends GlobalSettingsTabViewController { globalSettings.setUpdateChannel(c); }); - infoCLabel.setGraphic(new ImageView("gfx/class_obj.png")); - infoELabel.setGraphic(new ImageView("gfx/enum_obj.png")); - progressIndicator = new ProgressIndicator(-1); progressIndicator.setMinSize(75, 75); progressIndicator.setMaxSize(75, 75); diff --git a/PlayWall/src/main/resources/gfx/class_obj.png b/PlayWall/src/main/resources/gfx/class_obj.png deleted file mode 100644 index bc915da4420060b4ea9984fc662935f10f19449a..0000000000000000000000000000000000000000 Binary files a/PlayWall/src/main/resources/gfx/class_obj.png and /dev/null differ diff --git a/PlayWall/src/main/resources/gfx/enum_obj.png b/PlayWall/src/main/resources/gfx/enum_obj.png deleted file mode 100644 index c2b5d8345058a26e8ffb4262277543bce417535b..0000000000000000000000000000000000000000 Binary files a/PlayWall/src/main/resources/gfx/enum_obj.png and /dev/null differ diff --git a/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml b/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml index c025b61b05a1371fb627e67e85a771114b8ea624..dba4e47b3eca8deb62e848020a91f7dd5b161c09 100644 --- a/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml +++ b/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml @@ -3,62 +3,51 @@ <?import javafx.geometry.Insets?> <?import javafx.scene.control.*?> <?import javafx.scene.layout.*?> -<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"> +<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"> <children> <HBox layoutX="14.0" layoutY="14.0" spacing="14.0"> <children> - <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="14.0" prefWidth="150.0" - text="%settings.update.label.current"/> - <Label fx:id="currentVersionLabel" layoutX="175.0" layoutY="14.0" text="5.0.1 (stable)"/> + <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="14.0" prefWidth="150.0" text="%settings.update.label.current" /> + <Label fx:id="currentVersionLabel" layoutX="175.0" layoutY="14.0" text="5.0.1 (stable)" /> </children> </HBox> - <Separator prefWidth="200.0"/> + <Separator prefWidth="200.0" /> <HBox spacing="14.0"> <children> - <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="183.0" prefWidth="150.0" - text="%settings.update.label.search"/> - <CheckBox fx:id="automaticSearchCheckBox" layoutX="275.0" layoutY="183.0" mnemonicParsing="false" - text="Automatisch"/> + <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="183.0" prefWidth="150.0" text="%settings.update.label.search" /> + <CheckBox fx:id="automaticSearchCheckBox" layoutX="275.0" layoutY="183.0" mnemonicParsing="false" text="Automatisch" /> </children> </HBox> <HBox alignment="CENTER_LEFT" spacing="14.0"> <children> - <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.channel"/> - <ComboBox fx:id="updateChannelComboBox" prefWidth="150.0"/> + <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.channel" /> + <ComboBox fx:id="updateChannelComboBox" prefWidth="150.0" /> </children> </HBox> <HBox spacing="14.0"> <children> - <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="222.0" prefWidth="150.0"/> - <Button fx:id="manualSearchButton" layoutX="275.0" layoutY="217.0" mnemonicParsing="false" - onAction="#manualSearchHandler" text="%settings.update.button.search"/> + <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="222.0" prefWidth="150.0" /> + <Button fx:id="manualSearchButton" layoutX="275.0" layoutY="217.0" mnemonicParsing="false" onAction="#manualSearchHandler" text="%settings.update.button.search" /> </children> </HBox> - <Separator prefWidth="200.0"/> + <Separator prefWidth="200.0" /> <HBox spacing="14.0"> <children> - <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.available"/> + <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.available" /> <VBox spacing="14.0" HBox.hgrow="ALWAYS"> <children> - <ListView fx:id="openUpdateList" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS"/> - <HBox spacing="14.0"> - <children> - <Label fx:id="infoCLabel" text="%settings.update.label.infoC"/> - <Label fx:id="infoELabel" text="%settings.update.label.infoE"/> - </children> - </HBox> + <ListView fx:id="openUpdateList" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" /> </children> </VBox> </children> </HBox> <HBox alignment="TOP_RIGHT"> <children> - <Button fx:id="updateButton" mnemonicParsing="false" onAction="#updateHandler" - text="%settings.update.button.install"/> + <Button fx:id="updateButton" mnemonicParsing="false" onAction="#updateHandler" text="%settings.update.button.install" /> </children> </HBox> </children> <padding> - <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/> + <Insets bottom="14.0" left="14.0" right="14.0" top="14.0" /> </padding> </VBox>