From 431f2860545876efb39f71cab5abf43b5c9b62be Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sun, 17 Feb 2019 14:02:57 +0100 Subject: [PATCH] Remove icons in update tab --- .../global/UpdateTabViewController.java | 9 ---- PlayWall/src/main/resources/gfx/class_obj.png | Bin 628 -> 0 bytes PlayWall/src/main/resources/gfx/enum_obj.png | Bin 504 -> 0 bytes .../view/option/global/UpdateTab.fxml | 41 +++++++----------- 4 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 PlayWall/src/main/resources/gfx/class_obj.png delete mode 100644 PlayWall/src/main/resources/gfx/enum_obj.png 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 96dbb5e3..25aa0e20 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 GIT binary patch literal 0 HcmV?d00001 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 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 GIT binary patch literal 0 HcmV?d00001 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# diff --git a/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml b/PlayWall/src/main/resources/view/option/global/UpdateTab.fxml index c025b61b..dba4e47b 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> -- GitLab