MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix

Browse Source 
# Conflicts:
#	client/app/src/main/java/main/CreateEventController.java
This commit is contained in:
Marco Kühn
2022-01-18 09:48:22 +01:00
parent a24addf6ec 051000169e
commit 521b1cb2f7
6 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/app/src/main/java/main/CreateEventController.java
View File

@@ -21,11 +21,11 @@ public class CreateEventController {
@FXML
public GridPane mainGrid;
@FXML
public DatePicker datePickerDate;
public JFXDatePicker datePickerDate;
@FXML
public JFXTextField textName;
@FXML
public ComboBox<String> ComboBoxPriotity;
public JFXComboBox<String> ComboBoxPriotity;
@FXML
public JFXToggleButton toggleBtnIsFullDay;
@FXML
@@ -38,7 +38,6 @@ public class CreateEventController {
public JFXTimePicker timeEnd;
public CreateEventController() {
}

6
client/app/src/main/java/users/LoginController.java
View File

@@ -1,18 +1,18 @@
package users;
import com.jfoenix.controls.*;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.stage.Stage;
import res.DataController;
public class LoginController {
@FXML
public TextField userField;
public JFXTextField userField;
@FXML
public TextField passField;
public JFXPasswordField passField;
@FXML
public Label userErrLabel;
@FXML