From 0bbf44554c38ae4aec1756c2a725894c1c3ec714 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Mon, 4 Jul 2016 21:38:49 +0200
Subject: [PATCH] Add Icons to Update Tab
---
.../tobias/playpad/assets/files/class_obj.png | Bin 0 -> 628 bytes
.../tobias/playpad/assets/files/enum_obj.png | Bin 0 -> 504 bytes
.../playpad/assets/lang/ui_de.properties | 2 ++
.../playpad/assets/view/option/updateTab.fxml | 24 +++++++++++++-----
.../viewcontroller/cell/UpdateCell.java | 7 +++++
.../option/UpdateTabViewController.java | 7 +++++
6 files changed, 33 insertions(+), 7 deletions(-)
create mode 100644 PlayWall/assets/de/tobias/playpad/assets/files/class_obj.png
create mode 100644 PlayWall/assets/de/tobias/playpad/assets/files/enum_obj.png
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
GIT binary patch
literal 628
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!totUX;ELn>~a4T{c~lqm6S
z(dl)!4mvCE>bU57;jG@IpY^jkO$(Q0Zk;h@=Yk0KZCC!^pOhQal-PDI(>wF+vZx!b
zJDroW9fiw8T^}5k5;VM?csPq)w_VhK{{PTjrZ3j9$JxpKnD^Y4i$zsqvuAmirO=IQ
zdi8n_J$9|~wbL$|5a7DHq&>lThsbOforfzlZeK|M^;BltgHIX4=Z;D(e0}x5fYppW
z6I9Rbf2BHSPyP1jxqFSuxNJMq?o>Z?vynV>z?*-U`uPRPPgGV}Pl;UE9C5wl^jo9W
z7S+|U%3&_c=0rqzKJ-7MyRWhQk;x7B<BDlBr|Pa*v`WQV^7?&~1C|*_k1vgk`(kF>
zyYNZup7@&MpF6MfUzFSKAi84tTLJ%xj!Wl8n%=kLxnCjv-}1k4e>eZEg0cmIx`y0V
z?9mT;=0E?rF<Q;zmdBzUth0HZ?NjbhIke~CnLj4yuX87_7c5!uQi(b0(w=S6{M9{=
zd8h5yca}F=XqVyOe1zx!WQ9G8?dA!upC&bdUzP1lMDK1s_CIPhQBe<k<Cad^@yp`C
zepa7zK8}^X?Xh~MTC!*6K9amK<8PARyuhFQj}Fy}y*%@Lk?xXxXC7u;Y1(_eRNzwO
z)a}=<t%+3C)egJ6Q-3+%tHhpJ52d~-e9`IZQ#3b86b{*P^zHO1_cOlzE9GCgD01V@
zNvfS|b3e_wvb=TIafY+K&MUa3HymHx*pY0s<!ZviBy*eRM$vCMt1g{9l(s^_{js*F
q{n`yDQ<~~qk1W#=|MUF^?>)b`O@-Divlti{7(8A5T-G@yGywqId?^<I
literal 0
HcmV?d00001
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
GIT binary patch
literal 504
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7_j|fHhE&|T8+_91aDd3!
zLrdi!9@`TVxJKhqfX0r%7>$k&kI5Mu`PPc+1PQvhva%a=DsJsn>Js*Il?gD{W4XKY
zO^`t8%b*oYd9VL&612L(|KWgQ!TYECitkw`&fxJ#Ds0se@O-OV9raf8ufskMCh<Vm
zX~~}wZ@tu+P$?9`lJv%Bi;BL8{+*WN3cH@Popnf_bS<@U_Rr!*om(YWW9RJ%`CCxG
zVaCzoN`U}hr=pE<YSCuTk6eCO64>&3E5nmR*>42<p6zxN++lG}e5r1L%k8P})|>l@
zRV>(2u$uj$m$YH!wnv854;x>#9GU#I<fqN|opz5J-hND*EcR{rt@>=S(t73xjr@|_
z92s)fEo`fN(hhknRWORl|7POP`XIF~MJM6D>O9tNv29Jh4pZ0umW@zP<4<>dcys#~
z>jx)iUP?9&DVGe0>iCg$a8+aoOSI5)^Ud*&3B3ZhB2FhZDwWBzu079p<y}{INb2(g
zu1;MMpG4(WH6Fg{XEEn>)7_J1H-0}nwqkOX{{tr7^a)$~E;;qQF+6tT!mqb&?^YZC
zy_~;dy^-pFm5FL*`AaUwYumk+bu;&SdP?bg&qK=v|2aO}f8>2%lXiB&!fT8S3=9mO
Lu6{1-oD!M<(U|7#
literal 0
HcmV?d00001
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 70b3e718..1ad02a36 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 e08fc46d..2f2c9405 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 fc712479..41830f8e 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 77c8d70b..3e3ba053 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);
--
GitLab