zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Moved all FXML files to the resource folder

Browse Source
This commit is contained in:
Kai S. K. Engelbart
2020-04-10 21:26:24 +02:00
parent 01a5a95adf
commit 78f14ffcb4
4 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/envoy/client/ui/ChatScene.fxml
View File

@@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<GridPane id="recipientLabel" maxHeight="-Infinity"
maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
prefHeight="400.0" prefWidth="600.0"
xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="envoy.client.ui.ChatSceneController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
</rowConstraints>
<children>
<ListView fx:id="userList" prefHeight="211.0"
prefWidth="300.0" GridPane.rowIndex="1"
onMouseClicked="#userListClicked" />
<Label text="Select a contact to chat with" fx:id="contactLabel" />
<Button fx:id="settingsButton" mnemonicParsing="false"
text="Settings" GridPane.columnIndex="1"
onAction="#settingsButtonClicked" />
<ListView fx:id="messageList" prefHeight="257.0"
prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Button fx:id="postButton" mnemonicParsing="false" text="Post"
GridPane.columnIndex="1" GridPane.rowIndex="2"
onAction="#postButtonClicked" disable="true" />
<TextArea fx:id="messageTextArea" prefHeight="200.0"
prefWidth="200.0" GridPane.rowIndex="2"
onKeyReleased="#messageTextUpdated" />
</children>
</GridPane>

62
src/main/java/envoy/client/ui/LoginDialog.fxml
View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.DialogPane?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.PasswordField?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<DialogPane prefHeight="201.0" prefWidth="525.0"
xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1">
<content>
<VBox maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0"
prefWidth="545.0">
<children>
<Label text="User Login">
<font>
<Font size="26.0" />
</font>
</Label>
<GridPane>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES"
minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES"
minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0"
vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="User Name:" />
<Label text="Password" GridPane.rowIndex="1" />
<Label fx:id="repeatPasswordLabel" text="Repeat Password:"
visible="false" GridPane.rowIndex="2" />
<TextField fx:id="userTextField"
GridPane.columnIndex="1" />
<PasswordField fx:id="passwordField"
GridPane.columnIndex="1" GridPane.rowIndex="1" />
<PasswordField fx:id="repeatPasswordField"
visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
</children>
</GridPane>
<CheckBox fx:id="registerCheckBox" mnemonicParsing="false"
onAction="#registerCheckboxChanged" text="Register" />
</children>
</VBox>
</content>
</DialogPane>

2
src/main/java/envoy/client/ui/LoginDialog.java
View File

@@ -72,7 +72,7 @@ public final class LoginDialog extends Dialog<Void> {
this.localDB = localDB;
this.receivedMessageCache = receivedMessageCache;
final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml"));
final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml"));
loader.setController(this);
final var dialogPane = loader.<DialogPane>load();

2
src/main/java/envoy/client/ui/Startup.java
View File

@@ -124,7 +124,7 @@ public final class Startup extends Application {
.forEach(u -> u.setStatus(UserStatus.OFFLINE));
// Prepare stage and load ChatScene
var loader = new FXMLLoader(getClass().getResource("ChatScene.fxml"));
var loader = new FXMLLoader(getClass().getResource("/fxml/ChatScene.fxml"));
var anchorPane = loader.<GridPane>load();
var chatScene = new Scene(anchorPane);
stage.setTitle("Envoy");