Commit 81a1fd6b authored by Jens Ehlers's avatar Jens Ehlers
Browse files

JavaFX updates

parent 6089aae6
...@@ -28,12 +28,17 @@ ...@@ -28,12 +28,17 @@
<dependency> <dependency>
<groupId>com.jfoenix</groupId> <groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId> <artifactId>jfoenix</artifactId>
<version>9.0.8</version> <version>9.0.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.jensd</groupId> <groupId>de.jensd</groupId>
<artifactId>fontawesomefx-materialicons</artifactId> <artifactId>fontawesomefx-materialicons</artifactId>
<version>2.2.0-9.1.2</version> <version>2.2.0-11</version>
</dependency>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mashape.unirest</groupId> <groupId>com.mashape.unirest</groupId>
......
...@@ -3,13 +3,9 @@ package shop.controller; ...@@ -3,13 +3,9 @@ package shop.controller;
import javafx.concurrent.WorkerStateEvent; import javafx.concurrent.WorkerStateEvent;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.PasswordField; import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
import shop.ShopApplication; import shop.ShopApplication;
import shop.model.User; import shop.model.User;
import shop.task.PostLoginTask; import shop.task.PostLoginTask;
......
...@@ -8,9 +8,8 @@ ...@@ -8,9 +8,8 @@
<?import javafx.scene.control.TableView?> <?import javafx.scene.control.TableView?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import java.net.URL?>
<?import com.jfoenix.controls.JFXButton?> <?import com.jfoenix.controls.JFXButton?>
<VBox xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" <VBox xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/9"
fx:controller="shop.controller.BookingsController"> fx:controller="shop.controller.BookingsController">
<HBox> <HBox>
<MaterialIconView glyphName="VIEW_LIST"></MaterialIconView> <MaterialIconView glyphName="VIEW_LIST"></MaterialIconView>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<VBox xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="shop.controller.CatalogController"> <VBox xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1" fx:controller="shop.controller.CatalogController">
<HBox> <HBox>
<MaterialIconView glyphName="SHOPPING_CART"></MaterialIconView> <MaterialIconView glyphName="SHOPPING_CART"></MaterialIconView>
<Label styleClass="subtitle">Produktkatalog</Label> <Label styleClass="subtitle">Produktkatalog</Label>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<?import com.jfoenix.controls.JFXPasswordField?> <?import com.jfoenix.controls.JFXPasswordField?>
<?import com.jfoenix.controls.JFXTextField?> <?import com.jfoenix.controls.JFXTextField?>
<VBox xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" <VBox xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="shop.controller.LoginController"> fx:controller="shop.controller.LoginController">
<HBox> <HBox>
<MaterialIconView glyphName="LOCK"></MaterialIconView> <MaterialIconView glyphName="LOCK"></MaterialIconView>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<?import javafx.scene.layout.StackPane?> <?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import java.net.URL?> <?import java.net.URL?>
<JFXDrawersStack xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" <JFXDrawersStack xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="shop.controller.MainController" fx:id="drawersStack"> fx:controller="shop.controller.MainController" fx:id="drawersStack">
<stylesheets> <stylesheets>
<URL value="@app.css"/> <URL value="@app.css"/>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<JFXListView fx:id="menu" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" <JFXListView fx:id="menu" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/9"
fx:controller="shop.controller.MenuController" onMouseClicked="#menuAction"> fx:controller="shop.controller.MenuController" onMouseClicked="#menuAction">
<HBox fx:id="catalog" alignment="CENTER_LEFT"> <HBox fx:id="catalog" alignment="CENTER_LEFT">
<MaterialIconView glyphName="SHOPPING_CART"></MaterialIconView> <MaterialIconView glyphName="SHOPPING_CART"></MaterialIconView>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment