diff --git a/PlayWall/assets/de/tobias/playpad/assets/files/class_obj.png b/PlayWall/assets/de/tobias/playpad/assets/files/class_obj.png new file mode 100644 index 0000000000000000000000000000000000000000..bc915da4420060b4ea9984fc662935f10f19449a Binary files /dev/null and b/PlayWall/assets/de/tobias/playpad/assets/files/class_obj.png differ diff --git a/PlayWall/assets/de/tobias/playpad/assets/files/enum_obj.png b/PlayWall/assets/de/tobias/playpad/assets/files/enum_obj.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b5d8345058a26e8ffb4262277543bce417535b Binary files /dev/null and b/PlayWall/assets/de/tobias/playpad/assets/files/enum_obj.png differ 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 70b3e7185f89ba79375b7aea71edf7677a23dd2a..1ad02a367c7a457e081958a4693bd4964f761953 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties +++ b/PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties @@ -70,6 +70,8 @@ settings.update.label.available=Verf settings.update.button.search=Jetzt suchen settings.update.button.install=Aktualisieren und neu starten settings.update.label.channel=Update Kanal: +settings.update.label.infoC=Program +settings.update.label.infoE=Erweiterung 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 e08fc46d9b20b2a92e3530069c2a18336ce06312..2f2c940576518b11583a9901fd0554f67d96ad10 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml +++ b/PlayWall/assets/de/tobias/playpad/assets/view/option/updateTab.fxml @@ -20,6 +20,12 @@ <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" /> + </children> + </HBox> <HBox spacing="14.0"> <children> <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="222.0" prefWidth="150.0" /> @@ -30,13 +36,17 @@ <HBox spacing="14.0"> <children> <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.available" /> - <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" /> + <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> + </children> + </VBox> </children> </HBox> <HBox alignment="TOP_RIGHT"> diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java index fc71247903e77023f9aff5ad4a48985f0aee6a17..41830f8e77e9468b342a5172ae78f63bd5366cbd 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java @@ -1,9 +1,11 @@ package de.tobias.playpad.viewcontroller.cell; +import de.tobias.playpad.PlayPadUpdater; import de.tobias.playpad.Strings; import de.tobias.playpad.update.Updatable; import de.tobias.utils.util.Localization; import javafx.scene.control.ListCell; +import javafx.scene.image.ImageView; public class UpdateCell extends ListCell<Updatable> { @@ -11,6 +13,11 @@ public class UpdateCell extends ListCell<Updatable> { protected void updateItem(Updatable item, boolean empty) { super.updateItem(item, empty); if (!empty) { + if (item instanceof PlayPadUpdater) { + setGraphic(new ImageView("de/tobias/playpad/assets/files/class_obj.png")); + } else { + setGraphic(new ImageView("de/tobias/playpad/assets/files/enum_obj.png")); + } setText(Localization.getString(Strings.UI_Dialog_Update_Cell, item.name(), item.getCurrentVersion(), item.getNewVersion())); } else { setText(""); diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java index 77c8d70b768248821de223ca4749b9bab1c62c2f..3e3ba0532a413ea2c6de6b266f18bfc2671e381a 100644 --- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java +++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java @@ -44,6 +44,7 @@ import javafx.scene.control.Label; import javafx.scene.control.ListView; import javafx.scene.control.ProgressIndicator; import javafx.scene.image.Image; +import javafx.scene.image.ImageView; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; @@ -64,6 +65,9 @@ public class UpdateTabViewController extends SettingsTabViewController { @FXML private ComboBox<UpdateChannel> updateChannelComboBox; + @FXML private Label infoCLabel; + @FXML private Label infoELabel; + // Placeholder for List private ProgressIndicator progressIndecator; private Label placeholderLabel; @@ -92,6 +96,9 @@ public class UpdateTabViewController extends SettingsTabViewController { Profile.currentProfile().getProfileSettings().setUpdateChannel(c); }); + infoCLabel.setGraphic(new ImageView("de/tobias/playpad/assets/files/class_obj.png")); + infoELabel.setGraphic(new ImageView("de/tobias/playpad/assets/files/enum_obj.png")); + progressIndecator = new ProgressIndicator(-1); progressIndecator.setMinSize(75, 75); progressIndecator.setMaxSize(75, 75);